diff --git a/app/models/clusters/applications/cert_manager.rb b/app/models/clusters/applications/cert_manager.rb
index ec0fab8ad99a4083df1c174e994dfec2d108d054..922f4a880f05ea2af96b9ab9041ec03c1a42f760 100644
--- a/app/models/clusters/applications/cert_manager.rb
+++ b/app/models/clusters/applications/cert_manager.rb
@@ -39,18 +39,20 @@ module Clusters
 
       def cluster_issuer_file
         {
-          'cluster_issuer.yaml': cluster_issuer_yaml_content
+          'cluster_issuer.yaml': cluster_issuer_content.deep_merge(cluster_issue_overlay)
         }
       end
 
-      def cluster_issuer_yaml_content
-        data = YAML.load_file(cluster_issuer_file_path)
-        data["spec"]["acme"]["email"] = self.email
-        YAML.dump(data)
+      def cluster_issuer_content
+        YAML.load_file(cluster_issuer_file_path)
+      end
+
+      def cluster_issue_overlay
+        { "spec" => { "acme" => { "email" => self.email } } }
       end
 
       def cluster_issuer_file_path
-        "#{Rails.root}/vendor/cert_manager/cluster_issuer.yaml"
+        Rails.root.join('vendor', 'cert_manager', 'cluster_issuer.yaml')
       end
     end
   end
diff --git a/app/services/clusters/applications/create_service.rb b/app/services/clusters/applications/create_service.rb
index 8f1b247343d738954c3999e87aaec8bd6d13322d..a89772e82dc99a427d3abd94560a21b7adf51e58 100644
--- a/app/services/clusters/applications/create_service.rb
+++ b/app/services/clusters/applications/create_service.rb
@@ -20,7 +20,7 @@ module Clusters
           end
 
           if application.has_attribute?(:email)
-            application.email = @current_user.email
+            application.email = current_user.email
           end
 
           if application.respond_to?(:oauth_application)