Fixed the currentUser bugs by adding a returnUser