Temporary fix for account settings page. For issue #218