Fixed merge issues incl broken passcode validation