More login system changes