diff --git a/src/com/android/email/activity/setup/AuthenticationView.java b/src/com/android/email/activity/setup/AuthenticationView.java
index e0f491916..ffeaefe61 100644
--- a/src/com/android/email/activity/setup/AuthenticationView.java
+++ b/src/com/android/email/activity/setup/AuthenticationView.java
@@ -20,6 +20,7 @@ import com.android.emailcommon.Device;
 import com.android.emailcommon.VendorPolicyLoader.OAuthProvider;
 import com.android.emailcommon.provider.Credential;
 import com.android.emailcommon.provider.HostAuth;
+import com.google.common.annotations.VisibleForTesting;
 
 import java.io.IOException;
 
@@ -118,6 +119,7 @@ public class AuthenticationView extends LinearLayout implements OnClickListener
         }
     }
 
+    @VisibleForTesting
     public void setPassword(final String password) {
         mPasswordEdit.setText(password);
     }
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java b/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java
index 5384ed576..565de8a86 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java
@@ -179,7 +179,7 @@ public class AccountSetupOutgoingTests extends
         mActivity = getActivity();
         mFragment = mActivity.mFragment;
         mServerView = (EditText) mActivity.findViewById(R.id.account_server);
-        mAuthenticationView = (AuthenticationView) mActivity.findViewById(R.id.account_server);
+        mAuthenticationView = (AuthenticationView) mActivity.findViewById(R.id.authentication_view);
     }
 
     /**