Merge "Fix warnings in SpecialEmailuser"