Adding FPS enroll and pasword cleanup