Current user fix