New user bug fixes
Merge remote-tracking branch 'MWBF-App/MWBF-Prod' into MWBF-Prod