OPAL-1883: Edit/Remove/Add and password validation