diff --git a/app/models/job_template.rb b/app/models/job_template.rb
index 38f09b6..586ab86 100644
--- a/app/models/job_template.rb
+++ b/app/models/job_template.rb
@@ -1,145 +1,145 @@
 # JobTemplate class is a helper class that enables us to configure Bacula job
 # configurations, without messing with Bacula's native models (Job).
 # It has a unique:
 #
 # * host
 # * fileset
 # * schedule
 class JobTemplate < ActiveRecord::Base
   establish_connection ARCHIVING_CONF
 
   enum job_type: { backup: 0, restore: 1, verify: 2, admin: 3 }
 
   belongs_to :host
   belongs_to :fileset
   belongs_to :schedule
 
   validates :name, :fileset_id,  presence: true
   validates :schedule_id, presence: true, unless: :restore?
   validates :name, uniqueness: { scope: :host }
   validates_with NameValidator
 
   before_save :set_job_type
   after_save :notify_host
 
   scope :enabled, -> { where(enabled: true) }
 
   # Constructs an array where each element is a line for the Job's bacula config
   #
   # @return [Array]
   def to_bacula_config_array
     ['Job {'] +
       options_array.map { |x| "  #{x}" } +
       runscript.map { |x| "  #{x}" } +
       job_settings.map { |k,v| "  #{k.capitalize} = #{v}" } +
       ['}']
   end
 
   # Fetches the Job's priority
   def priority
     job_settings[:priority]
   end
 
   # Helper method for the job template's enabled status
   def enabled_human
     enabled? ? 'yes' : 'no'
   end
 
   # Helper method for the job template's schedule name
   #
   # @return [String] The schedule's name or nothing
   def schedule_human
     schedule.present? ? schedule.name : '-'
   end
 
   # Generates a name that will be used for the configuration file.
   # It is the name that will be sent to Bacula through the configuration
   # files.
   #
   # @return [String]
   def name_for_config
     "#{host.name} #{name}"
   end
 
   # Sends a hot backup request to Bacula via BaculaHandler
   def backup_now
     return false if not (enabled? && baculized? && backup?)
     host.backup_now(name)
   end
 
   # Handles the returned attribues for api
   #
   # @return [Hash] of the desired attributes for api use
   def api_json
     {
       id: id,
       name: name,
       fileset: fileset.name_for_config
     }
   end
 
   # Creates a default job resource for a simple config
   def default_resource(name, time_hex)
     self.name = "job_#{name}_#{time_hex}"
 
     save!
 
     self
   end
 
   private
 
   def name_format
     unless name =~ /^[a-zA-Z0-1\.-_ ]+$/
       self.errors.add(:name, :format)
     end
   end
 
   def notify_host
     host.recalculate
   end
 
   # Sets the default job_type as backup
   def set_job_type
     self.job_type = :backup if job_type.nil?
   end
 
   def options_array
     result = [
       "Name = \"#{name_for_config}\"",
       "Enabled = #{enabled_human}",
       "FileSet = \"#{fileset.name_for_config}\"",
       "Client = \"#{host.name}\"",
       "Type = \"#{job_type.capitalize}\"",
       "Schedule = \"#{schedule.name_for_config}\""
     ]
 
     if client_before_run_file.present?
-      result += ["Client Run Before Job = \"#{client_before_run_file}\""]
+      result += ["Client Run Before Job = \"#{Shellwords.escape(client_before_run_file)}\""]
     end
     if client_after_run_file.present?
-      result += ["Client Run After Job = \"#{client_after_run_file}\""]
+      result += ["Client Run After Job = \"#{Shellwords.escape(client_after_run_file)}\""]
     end
 
     result
   end
 
   def runscript
     [
       'RunScript {',
       "  command = \"bash #{Archiving.settings[:quota_checker]} \\\"%c\\\" #{host.quota}\"",
       '  RunsOnClient = no',
       '  RunsWhen = Before',
       '}'
     ]
   end
 
   # Fetches and memoizes the general configuration settings for Jobs
   #
   # @see ConfigurationSetting.current_job_settings
   # @return [Hash] containing the settings
   def job_settings
     messages = host.email_recipients.any? ? host.message_name : :Standard
     @job_settings ||= ConfigurationSetting.current_job_settings.merge(messages: messages)
   end
 end