Fixed issues due to duplicate payment profile and address #5777