Resolving last conflict since last merge with fix_account_new_html