Fix User Settings Migrations

@hishamelgezeery Can you please review and merge ?!