Revert "Revert "Minor clean up of SAMT account mgmt""

This reverts commit affb666e0aa51df0432ca60de45f2a58724ae4ac.
Add step to clean up e-mail prior to rc account request