Additional Login/Register changes