Cleaned up tested versions to solve the issue introduced with moving _pw fields from customer to internal metadata (20130515)