diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java
index 59ddf743..267069c6 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java
+++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.java
@@ -76,7 +76,7 @@ public class LoginCredentialsFragment extends Fragment {
 
         String userName = editUserName.getText().toString();
         if (userName.isEmpty()) {
-            editUserName.setError(getString(R.string.login_user_name_required));
+            editUserName.setError(getString(R.string.login_email_address_error));
             valid = false;
         }
 
diff --git a/app/src/main/res/layout/login_credentials_fragment.xml b/app/src/main/res/layout/login_credentials_fragment.xml
index 872668a2..697a6449 100644
--- a/app/src/main/res/layout/login_credentials_fragment.xml
+++ b/app/src/main/res/layout/login_credentials_fragment.xml
@@ -40,7 +40,7 @@
                 android:id="@+id/user_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/login_user_name"
+                android:hint="@string/login_email_address"
                 android:inputType="textEmailAddress"/>
             <com.etesync.syncadapter.ui.widget.EditPassword
                 android:id="@+id/url_password"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3e305ec0..5488ec93 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -127,7 +127,7 @@
     <!-- AddAccountActivity -->
     <string name="login_title">Add account</string>
     <string name="login_type_email">Login with email address</string>
-    <string name="login_email_address">Email address</string>
+    <string name="login_email_address">Email</string>
     <string name="login_email_address_error">Valid email address required</string>
     <string name="login_password">Password</string>
     <string name="login_encryption_password">Encryption Password</string>