Address not visible in the Drupal Account when "primary" location type is used in profile

This bug seems to describe a similar problem but was several years ago and marked as fixed: http://issues.civicrm.org/jira/browse/CRM-1368 Not sure if it's related.

We're using a CiviCRM profile so our users can update their address. All address fields in the profile are set to use the "primary".

However, the address is only visible in the profile when it's their Home address. If the Contacts address is changed to work (and is still the primary), it's not visbile.

I attach the database values for our profile. I notice in the profile table "civicrm_uf_field" all our fields are set to "NULL" for location_type_id, but I presume it should default to primary if that's the case?