Fixed error page issue, more work on Auth