simplify password field option merge