diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 0ce1ca817..84768b12e 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -2345,6 +2345,7 @@ StScrollBar StButton#vhandle:active {
     padding-top: 24px;
     padding-bottom: 12px;
     spacing: 8px;
+    width: 23em;
 }
 
 .login-dialog-prompt-label {
@@ -2352,10 +2353,6 @@ StScrollBar StButton#vhandle:active {
     font-size: 14px;
 }
 
-.login-dialog-prompt-entry {
-    width: 20em;
-}
-
 .login-dialog-session-list-button StIcon {
     icon-size: 1.25em;
 }
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index 318bcfa02..0666294fe 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -96,6 +96,7 @@ const AuthPrompt = new Lang.Class({
         this._entry.grab_key_focus();
 
         this._message = new St.Label({ opacity: 0 });
+        this._message.clutter_text.line_wrap = true;
         this.actor.add(this._message, { x_fill: true });
 
         this._loginHint = new St.Label({ style_class: 'login-dialog-prompt-login-hint-message' });