diff --git a/deploy.sh b/deploy.sh
index 986a52d..e5f7f3a 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -9,11 +9,8 @@ HOST="$1"
 
 echo "Deploying to ${HOST}"
 
-echo "  * Cleaning deploy directory"
-ssh "${HOST}" 'sudo rm -rf /src/sites/fix_id'
-
 echo "  * Copying files"
-scp -r rel/fix_id/ "${HOST}:/src/sites/"
+rsync -avz rel/fix_id/ "${HOST}:/src/sites/fix_id/"
 scp fix_id.init "${HOST}:/src/sites/fix_id/"
 
 echo "  * Restarting application"
diff --git a/rel/files/sys.config b/rel/files/sys.config
index 451bedf..a8cbbd6 100644
--- a/rel/files/sys.config
+++ b/rel/files/sys.config
@@ -1,6 +1,9 @@
 %% -*- mode: erlang -*-
 
 [
+ {fix_id, [
+           {email_port, 2525}
+          ]},
  {sasl, [
          {sasl_error_logger, false}
         ]},
diff --git a/src/fix_id_email_scraper.erl b/src/fix_id_email_scraper.erl
index ac86fc7..51b8b20 100644
--- a/src/fix_id_email_scraper.erl
+++ b/src/fix_id_email_scraper.erl
@@ -19,7 +19,10 @@
 %% @doc Start the email server with default options.
 -spec(start_link/0 :: () -> {'ok', pid()} | 'ignore' | {'error', any()}).
 start_link() ->
-    gen_smtp_server:start_link(?MODULE).
+    case application:get_env(email_port) of
+        undefined  -> gen_smtp_server:start_link(?MODULE);
+        {ok, Port} -> gen_smtp_server:start_link(?MODULE, [[{port, Port}]])
+    end.
 
 %% @doc Initialize the callback module's state for a new session.
 %%