fixed null pointer exception
fixed login