diff --git a/ui/component/header/view.jsx b/ui/component/header/view.jsx
index 364933b42..9d43c976d 100644
--- a/ui/component/header/view.jsx
+++ b/ui/component/header/view.jsx
@@ -48,6 +48,7 @@ const Header = (props: Props) => {
 
   // on the verify page don't let anyone escape other than by closing the tab to keep session data consistent
   const isVerifyPage = history.location.pathname.includes(PAGES.AUTH_VERIFY);
+  const isAuthPage = history.location.pathname.includes(PAGES.AUTH);
 
   // Sign out if they click the "x" when they are on the password prompt
   const authHeaderAction = syncError ? { onClick: signOut } : { navigate: '/' };
@@ -204,7 +205,7 @@ const Header = (props: Props) => {
           )
         )}
 
-        {!authenticated && (
+        {!authenticated && !isAuthPage && (
           <Button
             button="primary"
             label={__('Sign In')}
diff --git a/ui/util/saved-passwords.js b/ui/util/saved-passwords.js
index e3a83d8c8..54e511608 100644
--- a/ui/util/saved-passwords.js
+++ b/ui/util/saved-passwords.js
@@ -78,7 +78,8 @@ export const getSavedPassword = () => {
     if (sessionPassword) {
       resolve(sessionPassword);
     }
-    return getKeychainPassword().then(p => p);
+
+    return getKeychainPassword().then(p => resolve(p));
   });
 };