Update Login Helper to be safe