Tweaked users migration