diff --git a/newparp/templates/account/user_new.html b/newparp/templates/account/user_new.html
index ef56b410..f9a89ff5 100644
--- a/newparp/templates/account/user_new.html
+++ b/newparp/templates/account/user_new.html
@@ -2,5 +2,11 @@
 {% block content: %}
     <h2>Awaiting activation.</h2>
     <p>Thank you for signing up! Before you start using MSPARP, please complete this final step to complete your registration. We've sent you an e-mail to confirm your registration. Please click the link provided in the e-mail to activate your account. The e-mail may be in your spam folder so make sure to check there too.</p>
-    <p>If you have not received an e-mail within twenty four hours, contact us through <a href="http://help.msparp.com">our support ticket system</a>.</p>
+    <p>If you have not received an e-mail within a few hours, click the button below to have a new verification e-mail sent.</p>
+    <form action="{{url_for("settings_change_email")}}" method="post">
+       <input type="hidden" name="token" value="{{g.csrf_token}}">
+       <input type="hidden" name="email_address" value="{{ g.user.email_address }}">
+       <p><button type="submit">Re-send verification e-mail</button></p>
+    </form>
+    <p>As a last resort, you can contact us through <a href="http://help.msparp.com">our support ticket system</a> for assistance, but be sure to check your SPAM FOLDER beforehand in case the e-mail ended up there.</p>
 {% endblock %}
diff --git a/newparp/views/guides.py b/newparp/views/guides.py
index da7f25aa..de7387ee 100644
--- a/newparp/views/guides.py
+++ b/newparp/views/guides.py
@@ -2,12 +2,12 @@
 
 
 def user_guide():
-    r = requests.get("https://karry.terminallycapricio.us/userguide/duplicateguide.html")
+    r = requests.get("http://alpacaweb.net/guides/userguide.html")
     r.encoding = r.apparent_encoding
     return r.text, r.status_code
 
 
 def bbcode_guide():
-    r = requests.get("https://karry.terminallycapricio.us/userguide/bbcodeguide.html")
+    r = requests.get("http://alpacaweb.net/guides/bbcode.html")
     r.encoding = r.apparent_encoding
     return r.text, r.status_code