Email forwards template cleanup
Fix login bug?