diff --git a/app/src/main/java/com/example/hochi/nextcompanion/LoginActivity.java b/app/src/main/java/com/example/hochi/nextcompanion/LoginActivity.java
index 08af359..1ff8e6b 100644
--- a/app/src/main/java/com/example/hochi/nextcompanion/LoginActivity.java
+++ b/app/src/main/java/com/example/hochi/nextcompanion/LoginActivity.java
@@ -95,8 +95,8 @@ public class LoginActivity extends AppCompatActivity implements AsyncTaskCallbac
         View focusView = null;
 
         // Check for a valid pin, if the user entered one.
-        if (!TextUtils.isEmpty(pin)) {
-            mPinView.setError(getString(R.string.error_invalid_pin));
+        if (TextUtils.isEmpty(pin)) {
+            mPinView.setError(getString(R.string.error_field_required));
             focusView = mPinView;
             cancel = true;
         }
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 62c82f2..c2eb60a 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.example.hochi.nextcompanion.MainActivity">
     <item
-        android:id="@+id/action_settings"
+        android:id="@+id/action_logout"
         android:orderInCategory="100"
-        android:title="@string/action_settings"
+        android:title="@string/action_logout"
         app:showAsAction="never" />
 </menu>