Getting no-close working, plus Cancel on Login

Getting no-close working, plus Cancel on Login