diff --git a/templates/profile.html b/templates/profile.html
index b21ffbb..cff385c 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -63,18 +63,26 @@
 					<div class="table element">
 						<h1 class="ui header">
 							{{ $user := . }}
-							{{ if $user.clan}}
-								<td class="right aligned"><a href="/c/{{ $user.clan.id }}?mode=0">{{ $user.clan.tag }} </a></td>
-							{{ end }}
+							
 							{{ if $super }}
 							<div class="owner">
-								{{ .username }}
+							{{ if $user.clan}}
+								<td class="right aligned"><a href="/c/{{ $user.clan.id }}?mode=0">[{{ $user.clan.tag }}]</a></td>
+							{{ end }}
+							
+							{{ .username }}
 							</div>
 							{{else if $donor}}
 							<div class="dev">
+							{{ if $user.clan}}
+									<td class="right aligned"><a href="/c/{{ $user.clan.id }}?mode=0">[{{ $user.clan.tag }}]</a></td>
+							{{ end }}
 								{{ .username }}
 							</div>
 							{{ else }}
+							{{ if $user.clan}}
+								<td class="right aligned"><a href="/c/{{ $user.clan.id }}?mode=0">[{{ $user.clan.tag }} ]</a></td>
+							{{ end }}
 								{{ .username }}
 							{{ end }}
 						</h1>
diff --git a/templates/profile_auto.html b/templates/profile_auto.html
index 8f0dc69..86f2a45 100644
--- a/templates/profile_auto.html
+++ b/templates/profile_auto.html
@@ -62,17 +62,27 @@
 					</div>
 					<div class="table element">
 						<h1 class="ui header">
-							{{ if $super }}
-							<div class="owner">
+								{{ if $super }}
+								<div class="owner">
+								{{ if $user.clan}}
+									<td class="right aligned"><a href="/c/{{ $user.clan.id }}?mode=0">[{{ $user.clan.tag }}]</a></td>
+								{{ end }}
+								
 								{{ .username }}
-							</div>
-							{{else if $donor}}
-							<div class="dev">
-								{{ .username }}
-							</div>
-							{{ else }}
-								{{ .username }}
-							{{ end }}
+								</div>
+								{{else if $donor}}
+								<div class="dev">
+								{{ if $user.clan}}
+										<td class="right aligned"><a href="/c/{{ $user.clan.id }}?mode=0">[{{ $user.clan.tag }}]</a></td>
+								{{ end }}
+									{{ .username }}
+								</div>
+								{{ else }}
+								{{ if $user.clan}}
+									<td class="right aligned"><a href="/c/{{ $user.clan.id }}?mode=0">[{{ $user.clan.tag }} ]</a></td>
+								{{ end }}
+									{{ .username }}
+								{{ end }}
 						</h1>
 						{{ if .username_aka }}
 							<div class="subtitle">
diff --git a/templates/profile_relax.html b/templates/profile_relax.html
index 7403a6e..f68df2f 100644
--- a/templates/profile_relax.html
+++ b/templates/profile_relax.html
@@ -62,17 +62,27 @@
 					</div>
 					<div class="table element">
 						<h1 class="ui header">
-							{{ if $super }}
-							<div class="owner">
+								{{ if $super }}
+								<div class="owner">
+								{{ if $user.clan}}
+									<td class="right aligned"><a href="/c/{{ $user.clan.id }}?mode=0">[{{ $user.clan.tag }}]</a></td>
+								{{ end }}
+								
 								{{ .username }}
-							</div>
-							{{else if $donor}}
-							<div class="dev">
-								{{ .username }}
-							</div>
-							{{ else }}
-								{{ .username }}
-							{{ end }}
+								</div>
+								{{else if $donor}}
+								<div class="dev">
+								{{ if $user.clan}}
+										<td class="right aligned"><a href="/c/{{ $user.clan.id }}?mode=0">[{{ $user.clan.tag }}]</a></td>
+								{{ end }}
+									{{ .username }}
+								</div>
+								{{ else }}
+								{{ if $user.clan}}
+									<td class="right aligned"><a href="/c/{{ $user.clan.id }}?mode=0">[{{ $user.clan.tag }} ]</a></td>
+								{{ end }}
+									{{ .username }}
+								{{ end }}
 						</h1>
 						{{ if .username_aka }}
 							<div class="subtitle">