diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index f0b311cfaa838..58056bd705a18 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -316,20 +316,14 @@ public class LockPatternUtils {
 
     /**
      * Set the state of whether the device is permanently locked, meaning the user
-     * must authenticate via other means.  If false, that means the user has gone
-     * out of permanent lock, so the existing (forgotten) lock pattern needs to
-     * be cleared.
+     * must authenticate via other means.
+     *
      * @param locked Whether the user is permanently locked out until they verify their
      *   credentials.  Occurs after {@link #FAILED_ATTEMPTS_BEFORE_RESET} failed
      *   attempts.
      */
     public void setPermanentlyLocked(boolean locked) {
         setBoolean(LOCKOUT_PERMANENT_KEY, locked);
-
-        if (!locked) {
-            setLockPatternEnabled(false);
-            saveLockPattern(null);
-        }
     }
 
     /**
diff --git a/core/res/res/layout/keyguard_screen_glogin_unlock.xml b/core/res/res/layout/keyguard_screen_glogin_unlock.xml
index 74ff3b029cca2..6e00d11a167cf 100644
--- a/core/res/res/layout/keyguard_screen_glogin_unlock.xml
+++ b/core/res/res/layout/keyguard_screen_glogin_unlock.xml
@@ -42,7 +42,6 @@
                 android:gravity="center_vertical"
                 android:drawableLeft="@drawable/ic_lock_idle_lock"
                 android:drawablePadding="5dip"
-                android:text="@android:string/lockscreen_glogin_too_many_attempts"
                 />
         
             <!-- spacer below header -->
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index c14ecc0837489..073be4f091e87 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1294,7 +1294,11 @@
          their lock gesture -->
     <string name="lockscreen_forgot_pattern_button_text">Forgot pattern?</string>
 
-    <!-- Title of the unlock screen that uses your Google login and password -->
+    <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+    <string name="lockscreen_glogin_forgot_pattern">Account unlock</string>
+    <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
     <string name="lockscreen_glogin_too_many_attempts">Too many pattern attempts!</string>
     <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
     <string name="lockscreen_glogin_instructions">To unlock, sign in with your Google account</string>
@@ -1307,6 +1311,9 @@
     <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
     <string name="lockscreen_glogin_invalid_input">Invalid username or password.</string>
 
+    <!-- Displayed in a progress dialog while a username and password are being checked. -->
+    <string name="lockscreen_glogin_checking_password">Checking...</string>
+
     <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
     <string name="hour_ampm">"<xliff:g id="hour" example="3">%-l</xliff:g><xliff:g id="ampm" example="pm">%P</xliff:g>"</string>