Further update on password restart and on redirecting to correct user page