added password error
added returnTo support