Added in users and login support