Getting the current user setup better