Reduce form duplication, add user authentication tests to prevent undesired account changes