diff --git a/Habitica/res/layout/login_screen.xml b/Habitica/res/layout/login_screen.xml
index caadf8ee6..0fdd7579f 100644
--- a/Habitica/res/layout/login_screen.xml
+++ b/Habitica/res/layout/login_screen.xml
@@ -63,7 +63,7 @@
         android:layout_height="wrap_content"
         android:singleLine="true"
         android:imeOptions="actionNext"
-        android:hint="@string/email_username"
+        android:hint="@string/username"
                 />
 
         </TableRow>
@@ -71,8 +71,7 @@
         <TableRow
             android:id="@+id/email_row"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone">
+            android:layout_height="match_parent">
 
             <ImageView
                 android:layout_width="17dp"
@@ -111,7 +110,7 @@
             android:layout_height="wrap_content"
             android:inputType="textPassword"
             android:singleLine="true"
-            android:imeOptions="actionDone"
+            android:imeOptions="actionNext"
             android:hint="@string/password"
             />
         </TableRow>
@@ -119,8 +118,7 @@
         <TableRow
             android:id="@+id/confirm_password_row"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone">
+            android:layout_height="match_parent">
 
             <ImageView
                 android:layout_width="17dp"
@@ -155,7 +153,7 @@
                     android:id="@+id/login_btn"
                     android:layout_width="150dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/login_btn"
+                    android:text="@string/register_btn"
                     android:layout_gravity="center_horizontal" />
 
                 <ProgressBar
diff --git a/Habitica/res/menu/login.xml b/Habitica/res/menu/login.xml
index e1312d106..f3da6bcd3 100644
--- a/Habitica/res/menu/login.xml
+++ b/Habitica/res/menu/login.xml
@@ -7,7 +7,7 @@
 			android:id="@+id/action_toggleRegistering"
 			android:orderInCategory="1"
 			app:showAsAction="ifRoom"
-			android:title="@string/register_btn"
+			android:title="@string/login_btn"
 			abc:showAsAction="ifRoom"/>
 
 </menu>
\ No newline at end of file
diff --git a/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
index 1bf15969d..40ef42584 100644
--- a/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
@@ -115,7 +115,6 @@ public class LoginActivity extends AppCompatActivity
 		mApiHelper = new APIHelper(this,hc);
 
         this.isRegistering = true;
-        this.setRegistering(this.isRegistering);
     }
 
 	private void resetLayout() {