Index: suite_leahi/tst_settings_service/test.py
===================================================================
diff -u -rf7c5babf0cceeac7cacd155523b3fca43ac25a95 -rdd5ff0124f6b6a3812008af2ee764936f703c688
--- suite_leahi/tst_settings_service/test.py	(.../test.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
+++ suite_leahi/tst_settings_service/test.py	(.../test.py)	(revision dd5ff0124f6b6a3812008af2ee764936f703c688)
@@ -438,8 +438,7 @@
 
 def main():
     utils.tstStart(__file__)
-    application_init.update_password_back_to_default_password()
-    
+    application_init.reset_system_setting("Password")
     startApplication(utility.aut("-E"))
     td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0)
     login_page_title_text = utility.get_object_from_names(
@@ -451,8 +450,7 @@
     else:
         closeWindow(names.o_Gui_MainView)
         
-    application_init.update_password_back_to_default_password()
-    
+    application_init.reset_system_setting("Password")
     startApplication(utility.aut("-q"))
     service_login()
     date_and_time_screen()