Issue #79, Fix AjaxError
Issue #79, Fix AjaxError
Merge branch 'C1_Sameh_#79_account_settings' into C1_master_preview