Cleanup

Removing redundant code
Reload safety user

Fixed so the user on reload don't have to register again, as long as
session is active.