Allow add for existing user + Small fix in list

So we can change a user without needing to remove and add.