Cap 1 user add fixes/screen update