Refactor password checking fix +add addit.check

Change-Id: I545aa160ae5a33bbe9485af961c5cca46f75159e