Only append non_unique parameter if a uid is provided as well
Merge pull request #3470 from langemeijer/devel

Only append non_unique parameter if a uid is provided as well to user module