reworked how current user is stored