Changed behaviour of signup
Merged