diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 0dc5b703d..5c1c1d7c9 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -2244,6 +2244,10 @@ StScrollBar StButton#vhandle:active {
     min-width: 350px;
 }
 
+.login-dialog-button-box {
+    spacing: 5px;
+}
+
 .login-dialog-prompt-login-hint-message {
     font-size: 10.5pt;
 }
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index adb5d5596..57b6019a3 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -512,7 +512,7 @@ const LoginDialog = new Lang.Class({
         this._promptLoginHint = new St.Label({ style_class: 'login-dialog-prompt-login-hint-message' });
         this._promptBox.add(this._promptLoginHint);
 
-        this._buttonBox = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
+        this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
                                              vertical: false });
         this._promptBox.add(this._buttonBox,
                             { expand:  true,