fixed login and signup with availability check
merge User into master