Signin return to back refactoring