Improve signin/signup #1
Fix NullPointerException #1