Refactoring signin stuff

You are right...