fixed npe
MUC: set password in bookmark only when it was set before.
Merge remote-tracking branch 'upstream/development' into bookmark_password