Modify authentification to work with separate model columns