Index: suite_leahi/tst_settings_service/test.py
===================================================================
diff -u -rf7c5babf0cceeac7cacd155523b3fca43ac25a95 -r15cf4707bd2bf83f895a09f63ca2a0462a9bdc00
--- suite_leahi/tst_settings_service/test.py	(.../test.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
+++ suite_leahi/tst_settings_service/test.py	(.../test.py)	(revision 15cf4707bd2bf83f895a09f63ca2a0462a9bdc00)
@@ -438,7 +438,8 @@
 
 def main():
     utils.tstStart(__file__)
-    application_init.update_password_back_to_default_password()
+    # 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)
@@ -451,8 +452,9 @@
     else:
         closeWindow(names.o_Gui_MainView)
         
-    application_init.update_password_back_to_default_password()
-    
+    # application_init.update_password_back_to_default_password()
+    application_init.reset_system_setting("Password")
+
     startApplication(utility.aut("-q"))
     service_login()
     date_and_time_screen()