Moved some stuff between normal user and user