diff --git a/manifests/application.pp b/manifests/application.pp
index ae81d1e..e7591e7 100644
--- a/manifests/application.pp
+++ b/manifests/application.pp
@@ -61,6 +61,7 @@ class storyboard::application (
   $default_url            = 'https://storyboard.example.org',
   $smtp_host              = 'localhost',
   $smtp_port              = 25,
+  $reply_to_email_address = undef,
 
 ) {
 
diff --git a/templates/storyboard.conf.erb b/templates/storyboard.conf.erb
index 6f6ba98..00edd55 100644
--- a/templates/storyboard.conf.erb
+++ b/templates/storyboard.conf.erb
@@ -153,7 +153,7 @@ enable = <%= @enable_email %>
 # The email address from which storyboard will send its messages.
 sender = <%= @sender_email_address %>
 
-<% if scope.lookupvar('storyboard::application::reply_to_email_address') != :undef %>
+<% if @reply_to_email_address != :undef and @reply_to_email_address != nil %>
 
 # The email address of the Reply-To header (optional).
 reply_to = <%= @reply_to_email_address %>