Fixed EP-285 -- Reset Password shows up twice

Additionally clean up the userprofiles templates