diff --git a/app/views/shared/_analytics.html.erb b/app/views/shared/_analytics.html.erb
index 230f6f28..a93475fa 100644
--- a/app/views/shared/_analytics.html.erb
+++ b/app/views/shared/_analytics.html.erb
@@ -16,3 +16,19 @@
     ga('send', 'pageview');
   </script>
 <% end %>
+
+<% if ENV['ASMLYTICS'] %>
+  <script type="text/javascript">
+  ;(function(p,l,o,w,i){if(!p[i]){p.__asml=p.__asml||[];
+  p.__asml.push(i);p[i]=function(){(p[i].q=p[i].q||[]).push(arguments)
+  };p[i].q=p[i].q||[];n=l.createElement(o);g=l.getElementsByTagName(o)[0];n.async=1;
+  n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","https://d1uxm17u44dmmr.cloudfront.net/1.0.0/asml.js","asml"));
+
+  asml('create', '<%= ENV['ASMLYTICS'] %>');
+  <% if signed_in? %>
+    asml('track', '<%= current_user.email %>');
+  <% else %>
+    asml('track');
+  <% end %>
+  </script>
+<% end %>
diff --git a/config/database.yml b/config/database.yml
index e9e205dc..f25112c1 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -5,7 +5,7 @@ default: &default
   password:
   pool: 5
   port: <%= ENV['DEV_POSTGRES_PORT'] || 5432 %>
-  username: vagrant
+  username: <%= ENV['DB_USERNAME'] || 'vagrant' %>
 
 development:
   <<: *default