Readd part of [8904] removed in [8938]. Then mix them. So we fix #3495/#3506...

Readd part of [8904] removed in [8938]. Then mix them. So we fix #3495/#3506 and problem when connecting
with an already used nick.
Fixes problem when we change nick with dialog to an already used one and then cancel. Fixes #3506.