diff --git a/file/lib/form/ChatForm.class.php b/file/lib/form/ChatForm.class.php
index 2e71210..20b324a 100644
--- a/file/lib/form/ChatForm.class.php
+++ b/file/lib/form/ChatForm.class.php
@@ -218,9 +218,9 @@ public function save() {
 		));
 		$this->objectAction->executeAction();
 		$returnValues = $this->objectAction->getReturnValues();
-		
+
 		// add activity points
-		\wcf\system\user\activity\point\UserActivityPointHandler::getInstance()->fireEvent('be.bastelstu.chat.activityPointEvent.message', $returnValues->messageID, WCF::getUser()->userID);
+		\wcf\system\user\activity\point\UserActivityPointHandler::getInstance()->fireEvent('be.bastelstu.chat.activityPointEvent.message', $returnValues['returnValues']->messageID, WCF::getUser()->userID);
 		
 		$this->saved();
 	}
diff --git a/template/chat.tpl b/template/chat.tpl
index 3e81d86..f6419e6 100644
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -4,7 +4,7 @@
 	<title>{$room} - {lang}chat.general.title{/lang} - {PAGE_TITLE|language}</title>
 	
 	{include file='headInclude' sandbox=false}
-	{include file='javascriptInclude'}
+	{include file='javascriptInclude' application='chat'}
 	<script type="text/javascript">
 		//<![CDATA[
 			var chat;
@@ -92,7 +92,7 @@
 	<div id="timsChatTopic" class="container{if $room->topic|language === ''} empty{/if}">{$room->topic|language}</div>
 	<fieldset>
 		<div id="timsChatMessageContainer" class="timsChatMessageContainer container box shadow1">
-			<noscript><p class="error">{lang}chat.general.noJs{/lang}</p></noscript>
+			<p class="error noJsOnly">{lang}chat.general.noJs{/lang}</p>
 			<ul>
 			</ul>
 		</div>