diff --git a/templates/huginn/0/README.md b/templates/huginn/0/README.md
index 2cba211..ad2bb0f 100644
--- a/templates/huginn/0/README.md
+++ b/templates/huginn/0/README.md
@@ -8,6 +8,8 @@ Your agents are standing by!
 
 When huginn first starts up it will create one user named, `admin`, with the password, `password`, along with a number of example agents for that user. Each new user will start off with a set of example agents.
 
+**Warning**: The **Require Confirmed Email** option *must* be **off** when you first start up the stack because the default user has a fake email address and will not allow you to login. If desired, you can upgrade the stack and turn email verification back on after changing the admin's email address.
+
 The Huggin web interface is served in the `huginn_web` container on port `3000`. In order to get web traffic to the container you have to create a Rancher load balancer and route the traffic to the container on port `3000`.
 
 ## Scaling
diff --git a/templates/huginn/0/docker-compose.yml b/templates/huginn/0/docker-compose.yml
index d94586e..d58834b 100644
--- a/templates/huginn/0/docker-compose.yml
+++ b/templates/huginn/0/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       io.rancher.container.pull_image: always
 
   huginn-web:
-    image: huginn/huginn-single-process
+    image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a
     restart: always
     environment:
       DATABASE_ADAPTER: postgresql
@@ -46,7 +46,7 @@ services:
       io.rancher.container.pull_image: always
 
   huginn-agent-runner:
-    image: huginn/huginn-single-process
+    image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a
     restart: always
     environment:
       DATABASE_ADAPTER: postgresql
@@ -78,7 +78,7 @@ services:
     command: /scripts/init bin/agent_runner.rb
 
   huginn-delayed-job:
-    image: huginn/huginn-single-process
+    image: huginn/huginn-single-process:fc1daf8b91398929cedd72895cc95647e3ed7b6a
     restart: always
     environment:
       DATABASE_ADAPTER: postgresql
diff --git a/templates/huginn/0/rancher-compose.yml b/templates/huginn/0/rancher-compose.yml
index 2d4c317..6033748 100644
--- a/templates/huginn/0/rancher-compose.yml
+++ b/templates/huginn/0/rancher-compose.yml
@@ -31,7 +31,7 @@ catalog:
         description: Require newly registered users to confirm their Email address
         label: Require Confirmed Email
         required: true
-        default: true
+        default: false
         type: boolean
       - variable: SMTP_USER_NAME
         label: SMTP Username
@@ -71,6 +71,12 @@ catalog:
         label: Additional Gems
         required: false
         type: string
+      - variable: STORAGE_DRIVER
+        description: Rancher storage driver to use for database volume
+        label: Storage Driver
+        default: local
+        required: true
+        type: string
 services:
   postgres:
     scale: 1