diff --git a/panels/user-accounts/cc-user-panel.ui b/panels/user-accounts/cc-user-panel.ui
index 5825a1602..520202f2e 100644
--- a/panels/user-accounts/cc-user-panel.ui
+++ b/panels/user-accounts/cc-user-panel.ui
@@ -121,6 +121,8 @@
                     <property name="column_spacing">10</property>
                     <property name="row_spacing">10</property>
                     <property name="margin_top">40</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-end">12</property>
                     <property name="halign">GTK_ALIGN_CENTER</property>
                     <property name="height_request">300</property>
                     <child>
@@ -194,7 +196,7 @@
                       <object class="GtkEntry" id="full_name_entry">
                         <property name="visible">True</property>
                         <property name="max-length">255</property>
-                        <property name="width-chars">30</property>
+                        <property name="width-chars">18</property>
                         <property name="max-width-chars">30</property>
                         <property name="valign">GTK_ALIGN_CENTER</property>
                         <signal name="activate" handler="change_name_done" object="CcUserPanel" swapped="yes"/>