Finish fixing User Setup