Fixing storage of primary identity