Fill in both old and new ids for user/pass
Merge remote-tracking branch 'upstream/master'