Changed settings and fixed login