login stuff,
fixed login merge