Added SignOn handling, removed invocation on default