(fix) SignInFormFactory setup was using old name
(fix) Default template bad macro