Quick fix for NPE on login, needs more fixing