Merge sign up/out features in authentication