diff --git a/app/eve_api/templates/eve_api/character.html b/app/eve_api/templates/eve_api/character.html
index c6ecf6d..b9f3d1d 100644
--- a/app/eve_api/templates/eve_api/character.html
+++ b/app/eve_api/templates/eve_api/character.html
@@ -18,7 +18,7 @@
 	
         {% if character.corporation.alliance %}
 	<div class="character_alliance">
-		<span><a href="http://evemaps.dotlan.net/alliance/{{ character.corporation.alliance.name }}">{{ character.corporation.alliance.ticker }}</a></span>
+		<span><a href="{% url eveapi-alliance char.corporation.alliance.id %}">{{ character.corporation.alliance.ticker }}</a></span>
 		<img src="https://image.eveonline.com/Alliance/{{ character.corporation.alliance.id }}_64.png" />
 	</div>
         {% endif %}
@@ -31,7 +31,9 @@
 			<li><span class="stat">Gender:</span> <span class="value">{{ character.get_gender_display }}</span></li>
 			<li><span class="stat">Corporation:</span> <a href="{% url eveapi-corporation character.corporation.id %}">{{ character.corporation.name }}</a></span></li>
 			<li><span class="stat">Joined Corporation:</span> <span class="value">{{ character.corporation_date|date:"Y/m/d H:i:s" }} ({{ character.corporation_date|naturaltimediff }})</span></li>
-			<li><span class="stat">Alliance:</span> <span class="value"><a href="http://evemaps.dotlan.net/alliance/{{ character.corporation.alliance.name }}">{{ character.corporation.alliance.name }}</a></span></li>
+                        {% if character.corporation.alliance %}
+			<li><span class="stat">Alliance:</span> <span class="value"><a href="{% url eveapi-alliance char.corporation.alliance.id %}">{{ character.corporation.alliance.name }}</a></span></li>
+                        {% endif %}
 			<li><span class="stat">Security Status:</span> {{ character.security_status|floatformat:2 }}</span></li>
 			<li><span class="stat">Director:</span> <span class="value">{{ character.director }}</span></li>
                         {% if character.current_training %}