Inline method and simplify logic
Merge remote-tracking branch 'openaustralia_github/small_email_hash_refactor' into rails-3-develop