diff --git a/src/base/messaging/anonymous_messenger.py b/src/base/messaging/anonymous_messenger.py
index 0673cc4..af0c03f 100644
--- a/src/base/messaging/anonymous_messenger.py
+++ b/src/base/messaging/anonymous_messenger.py
@@ -121,10 +121,9 @@ class AnonymousMessenger(ClientXMPP):
                     self.disconnect()
                     self.logger.info('Rebooting...')
                     self.disable_local_users()
-                    Util.shutdown();
                     System.Process.kill_by_pid(int(System.Ahenk.get_pid_number()))
                     sys.exit(2)
-
+                    Util.shutdown();
 
                 except Exception as e:
                     self.logger.error('Error Message: {0}.'.format(str(e)))
diff --git a/src/base/registration/registration.py b/src/base/registration/registration.py
index aa7fb59..b9d1555 100644
--- a/src/base/registration/registration.py
+++ b/src/base/registration/registration.py
@@ -91,8 +91,6 @@ class Registration:
             self.logger.info('updating host name and service')
             self.install_and_config_ldap(reg_reply)
             self.update_registration_attrs(dn)
-            self.logger.info('Disable Users')
-            self.disable_local_users()
 
         except Exception as e:
             self.logger.error('Registartion error. Error Message: {0}.'.format(str(e)))