diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java b/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java
index 00f6074..94ad6ed 100644
--- a/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java
+++ b/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java
@@ -166,7 +166,11 @@ public void onClick(View v) {
         String password = passwordField.getText().toString();
 
         if (username.length() == 0) {
-          showToast(R.string.com_parse_ui_no_username_toast);
+          if (config.isParseLoginEmailAsUsername()) {
+            showToast(R.string.com_parse_ui_no_email_toast);
+          } else {
+            showToast(R.string.com_parse_ui_no_username_toast);
+          }
         } else if (password.length() == 0) {
           showToast(R.string.com_parse_ui_no_password_toast);
         } else {
diff --git a/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java b/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java
index 4e38b66..27f9dca 100644
--- a/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java
+++ b/ParseLoginUI/src/com/parse/ui/ParseSignupFragment.java
@@ -153,7 +153,11 @@ public void onClick(View v) {
     }
 
     if (username.length() == 0) {
-      showToast(R.string.com_parse_ui_no_username_toast);
+      if (config.isParseLoginEmailAsUsername()) {
+        showToast(R.string.com_parse_ui_no_email_toast);
+      } else {
+        showToast(R.string.com_parse_ui_no_username_toast);
+      }
     } else if (password.length() == 0) {
       showToast(R.string.com_parse_ui_no_password_toast);
     } else if (password.length() < minPasswordLength) {