some re-factoring, fixing up changing login settings