Current_user fix