diff --git a/app/views/redstoner_mailer/register_mail.html.erb b/app/views/redstoner_mailer/register_mail.html.erb
index ba5c2ca..dd916a6 100644
--- a/app/views/redstoner_mailer/register_mail.html.erb
+++ b/app/views/redstoner_mailer/register_mail.html.erb
@@ -3,7 +3,7 @@
     Hi <%= @user.name %>!
 
     <p>Thank you for registering on Redstoner.com!</p>
-    <p>To use your account, you need to <%= link_to "confirm", confirm_user_path(@user, code: @user.email_token, only_path: false), style: "text-decoration: none; color: #4096EE;" %> your email address.</p>
+    <p>To use your account, you need to <%= link_to "confirm", confirm_user_url(@user, code: @user.email_token), style: "text-decoration: none; color: #4096EE;" %> your email address.</p>
 
     <div>
 
@@ -21,11 +21,11 @@
       <p>Please click this link to confirm your registration:
       </p>
       <div width="100%" style="background-color: #ddd; padding: 1em; margin: 0; text-align: center;">
-        <%= link_to "confirm registration", confirm_user_path(@user, code: @user.email_token, only_path: false), style: "text-decoration: none; color: #f2f2f2; padding: 0.5em 2em; background-color: #4096EE; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; display: inline-block; text-transform: uppercase;" %>
+        <%= link_to "confirm registration", confirm_user_url(@user, code: @user.email_token), style: "text-decoration: none; color: #f2f2f2; padding: 0.5em 2em; background-color: #4096EE; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; display: inline-block; text-transform: uppercase;" %>
       </div>
       <p></p>
 
-      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_path(role: "staff", only_path: false), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
+      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game.</p>
       <p>Your Redstoner team</p>
 
     </div>
@@ -34,7 +34,7 @@
     <p><i>If you did not sign up on redstoner.com you can safely ignore this email!</i>
     </p>
     <p>You can contact us via:
-      <%= link_to "Website", root_path(only_path: false), style: "text-decoration: none; color: #4096EE;" %> |
+      <%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
       <%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
       <%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
       <%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>
diff --git a/app/views/redstoner_mailer/thread_reply_mail.html.erb b/app/views/redstoner_mailer/thread_reply_mail.html.erb
index 9c708f5..ec5f620 100644
--- a/app/views/redstoner_mailer/thread_reply_mail.html.erb
+++ b/app/views/redstoner_mailer/thread_reply_mail.html.erb
@@ -2,16 +2,16 @@
   <div style="color: #3f3f3f; width: 600px; max-width: 100%; padding: 2em; margin: auto;">
     Hi <%= @user.name %>!
 
-    <p><%= link_to @reply.author.name, user_path(@reply.author, only_path: false), style: "text-decoration: none; color: #4096EE;" %> has replied to '<%= @reply.thread.title %>' on the Redstoner forums!</p>
+    <p><%= link_to @reply.author.name, user_url(@reply.author), style: "text-decoration: none; color: #4096EE;" %> has replied to '<%= @reply.thread.title %>' on the Redstoner forums!</p>
 
     <blockquote>
       <%# TODO: fix relative links + iframes %>
       <%= render_md(@reply.content).html_safe %>
     </blockquote>
 
-    <p><%= link_to "Click here", forumthread_path(@reply.thread, only_path: false) + "##{@reply.id}", style: "text-decoration: none; color: #4096EE;" %> to view the thread.</p>
+    <p><%= link_to "Click here", forumthread_url(@reply.thread) + "##{@reply.id}", style: "text-decoration: none; color: #4096EE;" %> to view the thread.</p>
 
-      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_path(role: "staff", only_path: false), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
+      <p>If you have any questions or problems, just ask one of our <%= link_to "Staff", users_url(role: "staff"), style: "text-decoration: none; color: #4096EE;" %> in-game or on the forums!</p>
       <p>Your Redstoner team</p>
 
     </div>
@@ -20,7 +20,7 @@
     <p><i>You cannot (yet) unsubscribe from these mails, sorry about that. Will add this ASAP!</i>
     </p>
     <p>You can contact us via:
-      <%= link_to "Website", root_path(only_path: false), style: "text-decoration: none; color: #4096EE;" %> |
+      <%= link_to "Website", root_url, style: "text-decoration: none; color: #4096EE;" %> |
       <%= link_to "Twitter", "https://twitter.com/RedstonerServer", style: "text-decoration: none; color: #4096EE;" %> |
       <%= link_to "Google+", "https://google.com/+Redstoner", style: "text-decoration: none; color: #4096EE;" %> |
       <%= link_to "Email", "mailto:redstonerserver+website@gmail.com", style: "text-decoration: none; color: #4096EE;" %>