Reverted password loop changes due to terminate and restart not being suppressed