Fixed login createuser and admin
fixed conflicts