More a note to myself for this age old problem when restoring SQL databases.
Run this against the database you have the orphaned user in and it will fix the record in the master database.
Username/Password is for the user you need to fix.
EXEC sp_change_users_login 'Auto_Fix', 'username', NULL, 'password'