Move advanced user login - now with persistence