lib/origen/users/user.rb in origen-0.6.3 vs lib/origen/users/user.rb in origen-0.6.4

@@ -72,12 +72,20 @@
       def name_from_rc
         RevisionControl::Git.user_name
       end
 
       def email
-        @email ||= ENV['ORIGEN_EMAIL'] || email_from_rc || begin
-          if Origen.site_config.email_domain
-            "#{id}@#{Origen.site_config.email_domain}"
+        if current?
+          @email ||= ENV['ORIGEN_EMAIL'] || email_from_rc || begin
+            if Origen.site_config.email_domain
+              "#{id}@#{Origen.site_config.email_domain}"
+            end
+          end
+        else
+          @email ||= begin
+            if Origen.site_config.email_domain
+              "#{id}@#{Origen.site_config.email_domain}"
+            end
           end
         end
       end
 
       def email_from_rc