Merge two factor and password change into security tab, add some tests that look for forms and template errors