diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index e3a647f1a..190af9c2c 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -1884,6 +1884,7 @@ StScrollBar {
 .user-icon {
   background-size: contain;
   color: $osd_fg_color;
+  text-align: center;
   border-radius: 99px;
   &:hover {
     color: lighten($osd_fg_color,30%);
@@ -2010,15 +2011,11 @@ StScrollBar {
   .login-dialog-username,
   .user-widget-label {
     color: $osd_fg_color;
-    font-size: 120%;
+    font-size: 11pt;
     font-weight: bold;
-    text-align: left;
-    padding-left: 15px;
+    text-align: center;
+    padding-top: 24px;
   }
-    .user-widget-label {
-      &:ltr { padding-left: 14px; }
-      &:rtl { padding-right: 14px; }
-    }
 
   .login-dialog-prompt-layout {
       padding-top: 24px;
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index 6af342761..0c752caf5 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -445,7 +445,7 @@ var AuthPrompt = GObject.registerClass({
 
         if (user) {
             let userWidget = new UserWidget.UserWidget(user);
-            userWidget.x_align = Clutter.ActorAlign.START;
+            userWidget.x_align = Clutter.ActorAlign.CENTER;
             this._userWell.set_child(userWidget);
         }
     }
diff --git a/js/ui/userWidget.js b/js/ui/userWidget.js
index 03d4d6388..3f360e56b 100644
--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@@ -7,7 +7,7 @@ const { Clutter, GLib, GObject, St } = imports.gi;
 
 const Params = imports.misc.params;
 
-var AVATAR_ICON_SIZE = 64;
+var AVATAR_ICON_SIZE = 128;
 
 // Adapted from gdm/gui/user-switch-applet/applet.c
 //
@@ -20,7 +20,8 @@ class Avatar extends St.Bin {
         let themeContext = St.ThemeContext.get_for_stage(global.stage);
         params = Params.parse(params, { reactive: false,
                                         iconSize: AVATAR_ICON_SIZE,
-                                        styleClass: 'user-icon' });
+                                        styleClass: 'user-icon',
+                                        x_align: St.Align.MIDDLE, });
 
         super._init({
             style_class: params.styleClass,
@@ -73,7 +74,9 @@ class Avatar extends St.Bin {
         } else {
             this.style = null;
             this.child = new St.Icon({ icon_name: 'avatar-default-symbolic',
-                                       icon_size: this._iconSize });
+                                       icon_size: this._iconSize,
+                                       x_expand: true,
+                                       x_align: Clutter.ActorAlign.CENTER });
         }
     }
 });
@@ -86,11 +89,13 @@ class UserWidgetLabel extends St.Widget {
         this._user = user;
 
         this._realNameLabel = new St.Label({ style_class: 'user-widget-label',
-                                             y_align: Clutter.ActorAlign.CENTER });
+                                             x_expand: true,
+                                             x_align: Clutter.ActorAlign.CENTER });
         this.add_child(this._realNameLabel);
 
         this._userNameLabel = new St.Label({ style_class: 'user-widget-label',
-                                             y_align: Clutter.ActorAlign.CENTER });
+                                             x_expand: true,
+                                             x_align: Clutter.ActorAlign.CENTER });
         this.add_child(this._userNameLabel);
 
         this._currentLabel = null;
@@ -160,7 +165,7 @@ class UserWidgetLabel extends St.Widget {
 var UserWidget = GObject.registerClass(
 class UserWidget extends St.BoxLayout {
     _init(user) {
-        super._init({ style_class: 'user-widget', vertical: false });
+        super._init({ style_class: 'user-widget', vertical: true });
 
         this._user = user;