diff --git a/tools/www-tpl/default-en/club.tpl b/tools/www-tpl/default-en/club.tpl
index e7a117f..effb07a 100644
--- a/tools/www-tpl/default-en/club.tpl
+++ b/tools/www-tpl/default-en/club.tpl
@@ -26,7 +26,7 @@ var andSoItBegins = (new Date()).getTime();
 
 <script type="text/javascript">
 document.habboLoggedIn = {{ session.loggedIn }};
-var habboName = "{{ playerDetails.username }}";
+var habboName = "{{ playerDetails.getName() }}";
 var ad_keywords = "";
 var habboReqPath = "{{ site.sitePath }}";
 var habboStaticFilePath = "{{ site.staticContentPath }}/web-gallery";
@@ -96,7 +96,7 @@ body { behavior: url({{ site.staticContentPath }}/web-gallery/js/csshover.htc);
 			<li class="">
 				<a href="{{ site.sitePath }}/me">Home</a>			</li>
     		<li class="">
-				<a href="{{ site.sitePath }}/home/{{ playerDetails.username }}">My Page</a>    		</li>
+				<a href="{{ site.sitePath }}/home/{{ playerDetails.getName() }}">My Page</a>    		</li>
 			<li class="">
 				<a href="{{ site.sitePath }}/profile">Account Settings</a>			</li>
 				<li class="selected{% if gameConfig.getInteger('guides.group.id') == 0 %} last{% endif %}">
diff --git a/tools/www-tpl/default-en/homes/widget/guestbook/add.tpl b/tools/www-tpl/default-en/homes/widget/guestbook/add.tpl
index fb7c289..94ceb35 100644
--- a/tools/www-tpl/default-en/homes/widget/guestbook/add.tpl
+++ b/tools/www-tpl/default-en/homes/widget/guestbook/add.tpl
@@ -6,7 +6,7 @@
 	
 	<li id="guestbook-entry-{{ entry.getId() }}" class="guestbook-entry">
 		<div class="guestbook-author">
-			<img src="{{ site.sitePath }}/habbo-imaging/avatarimage?figure={{ entry.getUser().getFigure() }}&size=s&direction=4&head_direction=4&crr=0&gesture=&frame=1" alt="Alex" title="Alex"/>
+			<img src="{{ site.sitePath }}/habbo-imaging/avatarimage?figure={{ entry.getUser().getFigure() }}&size=s&direction=4&head_direction=4&crr=0&gesture=&frame=1" alt="{{ entry.getUser().getName() }}" title="{{ entry.getUser().getName() }}"/>
 		</div>
 			{% if hasDeletePermission %}
 			<div class="guestbook-actions">
@@ -26,4 +26,4 @@
 		</div>
 		<div class="guestbook-cleaner">&nbsp;</div>
 		<div class="guestbook-entry-footer metadata">{{ entry.getCreationDate() }}</div>
-	</li>
\ No newline at end of file
+	</li>