CQM-58 bugfixes

CQM-58 Cqmrg - no invalid password warning.