Fix #177 CPCSS notice has scenario that won't work correctly now due to the login structure

Fix #177 CPCSS notice has scenario that won't work correctly now due to the login structure #137