More fixes with loginField