reverted changes by Adam, since they break the login form