diff --git a/data/GtkGreeterSettingsWindow.ui b/data/GtkGreeterSettingsWindow.ui
index 110be43..ddfe37f 100644
--- a/data/GtkGreeterSettingsWindow.ui
+++ b/data/GtkGreeterSettingsWindow.ui
@@ -542,7 +542,7 @@
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">7</property>
+                    <property name="top_attach">8</property>
                     <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
@@ -605,8 +605,25 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
+                    <property name="top_attach">8</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="user_background_value">
+                    <property name="label" translatable="yes">Use user wallpaper if available</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin_left">24</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
                     <property name="top_attach">7</property>
-                    <property name="width">1</property>
+                    <property name="width">2</property>
                     <property name="height">1</property>
                   </packing>
                 </child>
@@ -985,7 +1002,6 @@
                         <property name="margin_left">24</property>
                         <property name="invisible_char">●</property>
                         <property name="width_chars">6</property>
-                        <property name="max_width_chars">6</property>
                         <property name="xalign">1</property>
                         <property name="adjustment">position_x_adjustment</property>
                         <property name="snap_to_ticks">True</property>
@@ -1033,7 +1049,6 @@
                         <property name="margin_left">24</property>
                         <property name="invisible_char">●</property>
                         <property name="width_chars">6</property>
-                        <property name="max_width_chars">6</property>
                         <property name="xalign">1</property>
                         <property name="adjustment">position_y_adjustment</property>
                         <property name="snap_to_ticks">True</property>
diff --git a/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py b/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
index f0b573a..379977f 100644
--- a/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
+++ b/lightdm_gtk_greeter_settings/GtkGreeterSettingsWindow.py
@@ -55,6 +55,8 @@
             'xft-hintstyle': (OptionEntry.ChoiceEntry, 'hintstyle', None),
             'background': (OptionEntry.BackgroundEntry, 'background',
                            '#000000'),
+            'user-background': (OptionEntry.BooleanEntry, 'user_background',
+                                'true'),
             'default-user-image': (OptionEntry.IconEntry, 'userimage',
                                    '#avatar-default'),
             # Panel