diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index 9bf1064dca..b1a9eba34f 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -115,6 +115,10 @@
                     </div>
 
                 </div>
+                <button type="submit" data-role="none" class="clearButton block btnSave hide">
+                    <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
+                </button>
+
                 <p>
                     <span style="color:#52B54B;margin-left:.5em;margin-right:.5em;">*</span><span>${LegendTheseSettingsShared}</span>
                 </p>
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 88b4d8c3fc..f2199371e0 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -138,6 +138,10 @@
                     </div>
 
                 </div>
+                <button type="submit" data-role="none" class="clearButton block btnSave hide">
+                    <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
+                </button>
+
                 <p>
                     <span style="color:#52B54B;margin-left:.5em;margin-right:.5em;">*</span><span>${LegendTheseSettingsShared}</span>
                 </p>
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index 9c4087a5ac..b99b90b45e 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -88,6 +88,11 @@
                         </div>
                     </div>
                 </div>
+
+                <button type="submit" data-role="none" class="clearButton block btnSave hide">
+                    <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
+                </button>
+                
                 <p>
                     <span style="color:#52B54B;margin-left:.5em;margin-right:.5em;">*</span><span>${LegendTheseSettingsShared}</span>
                 </p>
diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js
index e36f479771..174e8b6eac 100644
--- a/dashboard-ui/scripts/mypreferencesdisplay.js
+++ b/dashboard-ui/scripts/mypreferencesdisplay.js
@@ -25,16 +25,29 @@
         appStorage.setItem('enableThemeSongs-' + user.Id, $('#selectThemeSong', page).val());
         appStorage.setItem('enableBackdrops-' + user.Id, $('#selectBackdrop', page).val());
 
-        ApiClient.updateUserConfiguration(user.Id, user.Configuration);
+        return ApiClient.updateUserConfiguration(user.Id, user.Configuration);
     }
 
     function save(page) {
 
         var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
 
+        if (!AppInfo.enableAutoSave) {
+            Dashboard.showLoadingMsg();
+        }
+
         ApiClient.getUser(userId).then(function (user) {
 
-            saveUser(page, user);
+            saveUser(page, user).then(function () {
+
+                Dashboard.hideLoadingMsg();
+                if (!AppInfo.enableAutoSave) {
+                    Dashboard.alert(Globalize.translate('SettingsSaved'));
+                }
+
+            }, function () {
+                Dashboard.hideLoadingMsg();
+            });
 
         });
     }
@@ -55,6 +68,12 @@
 
         $('.displayPreferencesForm').off('submit', onSubmit).on('submit', onSubmit);
 
+        if (AppInfo.enableAutoSave) {
+            page.querySelector('.btnSave').classList.add('hide');
+        } else {
+            page.querySelector('.btnSave').classList.remove('hide');
+        }
+
     });
     pageIdOn('pageshow', "displayPreferencesPage", function () {
 
@@ -88,7 +107,9 @@
 
         var page = this;
 
-        save(page);
+        if (AppInfo.enableAutoSave) {
+            save(page);
+        }
 
     });
 
diff --git a/dashboard-ui/scripts/mypreferenceshome.js b/dashboard-ui/scripts/mypreferenceshome.js
index a54d610de1..b2cc9a0af3 100644
--- a/dashboard-ui/scripts/mypreferenceshome.js
+++ b/dashboard-ui/scripts/mypreferenceshome.js
@@ -197,21 +197,36 @@
         displayPreferences.CustomPrefs.home2 = $('#selectHomeSection3', page).val();
         displayPreferences.CustomPrefs.home3 = $('#selectHomeSection4', page).val();
 
-        ApiClient.updateDisplayPreferences('home', displayPreferences, user.Id, AppSettings.displayPreferencesKey()).then(function () {
+        return ApiClient.updateDisplayPreferences('home', displayPreferences, user.Id, AppSettings.displayPreferencesKey()).then(function () {
 
-            ApiClient.updateUserConfiguration(user.Id, user.Configuration);
+            return ApiClient.updateUserConfiguration(user.Id, user.Configuration);
         });
     }
 
     function save(page) {
 
+        Dashboard.showLoadingMsg();
+
         var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
 
+        if (!AppInfo.enableAutoSave) {
+            Dashboard.showLoadingMsg();
+        }
+
         ApiClient.getUser(userId).then(function (user) {
 
             ApiClient.getDisplayPreferences('home', user.Id, AppSettings.displayPreferencesKey()).then(function (displayPreferences) {
 
-                saveUser(page, user, displayPreferences);
+                saveUser(page, user, displayPreferences).then(function () {
+
+                    Dashboard.hideLoadingMsg();
+                    if (!AppInfo.enableAutoSave) {
+                        Dashboard.alert(Globalize.translate('SettingsSaved'));
+                    }
+
+                }, function () {
+                    Dashboard.hideLoadingMsg();
+                });
 
             });
         });
@@ -270,6 +285,12 @@
 
         $('.homeScreenPreferencesForm').off('submit', onSubmit).on('submit', onSubmit);
 
+        if (AppInfo.enableAutoSave) {
+            page.querySelector('.btnSave').classList.add('hide');
+        } else {
+            page.querySelector('.btnSave').classList.remove('hide');
+        }
+
     });
 
     pageIdOn('pageshow', "homeScreenPreferencesPage", function () {
@@ -293,8 +314,10 @@
     pageIdOn('pagebeforehide', "homeScreenPreferencesPage", function () {
 
         var page = this;
-
-        save(page);
+        
+        if (AppInfo.enableAutoSave) {
+            save(page);
+        }
     });
 
 })(jQuery, window, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/mypreferenceslanguages.js b/dashboard-ui/scripts/mypreferenceslanguages.js
index f8a4c7aa6f..f3f8133e2b 100644
--- a/dashboard-ui/scripts/mypreferenceslanguages.js
+++ b/dashboard-ui/scripts/mypreferenceslanguages.js
@@ -96,7 +96,7 @@
 
         AppSettings.enableCinemaMode(page.querySelector('.chkEnableCinemaMode').checked);
 
-        ApiClient.updateUserConfiguration(user.Id, user.Configuration);
+        return ApiClient.updateUserConfiguration(user.Id, user.Configuration);
     }
 
     function save(page) {
@@ -113,9 +113,22 @@
 
         var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
 
+        if (!AppInfo.enableAutoSave) {
+            Dashboard.showLoadingMsg();
+        }
+
         ApiClient.getUser(userId).then(function (result) {
 
-            saveUser(page, result);
+            saveUser(page, result).then(function () {
+
+                Dashboard.hideLoadingMsg();
+                if (!AppInfo.enableAutoSave) {
+                    Dashboard.alert(Globalize.translate('SettingsSaved'));
+                }
+
+            }, function () {
+                Dashboard.hideLoadingMsg();
+            });
 
         });
     }
@@ -141,6 +154,12 @@
         });
 
         $('.languagePreferencesForm').off('submit', onSubmit).on('submit', onSubmit);
+
+        if (AppInfo.enableAutoSave) {
+            page.querySelector('.btnSave').classList.add('hide');
+        } else {
+            page.querySelector('.btnSave').classList.remove('hide');
+        }
     });
 
     pageIdOn('pageshow', "languagePreferencesPage", function () {
@@ -168,7 +187,9 @@
 
         var page = this;
 
-        save(page);
+        if (AppInfo.enableAutoSave) {
+            save(page);
+        }
     });
 
 })(jQuery, window, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index de51a00fa8..f919c61b7c 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1555,6 +1555,7 @@ var AppInfo = {};
         AppInfo.enableNowPlayingBar = true;
         AppInfo.enableHomeTabs = true;
         AppInfo.enableNowPlayingPageBottomTabs = true;
+        AppInfo.enableAutoSave = browserInfo.mobile;
 
         AppInfo.enableAppStorePolicy = isCordova;