diff --git a/data/interfaces/default/manage.html b/data/interfaces/default/manage.html
index 7a7fb14a..eaa71963 100644
--- a/data/interfaces/default/manage.html
+++ b/data/interfaces/default/manage.html
@@ -62,7 +62,8 @@
 					</div>
 								
 				</fieldset>
-				<input type="button" value="Save Changes" onclick="doAjaxCall('musicScan',$(this),'tabs',true);return false;" data-success="Library will be scanned">
+				<input type="button" value="Save Changes" onclick="doAjaxCall('musicSave',$(this),'tabs',true);return false;" data-success="Changes have been saved">
+				<input type="button" value="Save Changes + Scan" onclick="doAjaxCall('musicScan',$(this),'tabs',true);return false;" data-success="Changes saved. Library will be scanned">
 			</form>
 		</div>
 
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 01eb83f0..61c252a9 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -370,6 +370,14 @@ class WebInterface(object):
         raise cherrypy.HTTPRedirect("home")
     importItunes.exposed = True
     
+    def musicSave(self, path, redirect=None, autoadd=0):
+        headphones.ADD_ARTISTS = autoadd
+        headphones.MUSIC_DIR = path
+        headphones.config_write()
+        if redirect:
+            raise cherrypy.HTTPRedirect(redirect)
+    musicSave.exposed = True
+    
     def musicScan(self, path, redirect=None, autoadd=0):
         headphones.ADD_ARTISTS = autoadd
         headphones.MUSIC_DIR = path