Fix template issues with signin