diff --git a/js/drupalchat.js b/js/drupalchat.js
index dac5895..195c28a 100644
--- a/js/drupalchat.js
+++ b/js/drupalchat.js
@@ -113,7 +113,7 @@ function drupalchatMain() {
   		    output = output + '<div class="chatboxuserpicture"><img height="20" width="20" src="'+drupalSettings.drupalchat.up+'" /></div>';
   		  }
   		  
-  		  output = output + '<span class="chatboxtime">'+hours+':'+minutes+'</span><a href="'+drupalSettings.basePath+'user/'+drupalSettings.drupalchat.uid+'">'+drupalSettings.drupalchat.username+'</a></div><p class=\''+drupalchat.send_current_message_id+'\'>'+message+'</p>';
+  		  output = output + '<span class="chatboxtime">'+hours+':'+minutes+'</span><a href="'+drupalSettings.path.baseUrl+'user/'+drupalSettings.drupalchat.uid+'">'+drupalSettings.drupalchat.username+'</a></div><p class=\''+drupalchat.send_current_message_id+'\'>'+message+'</p>';
             jQuery("#chatbox_"+chatboxtitle+" .chatboxcontent").append(output);
           }
   		jQuery("#chatbox_"+chatboxtitle+" .chatboxcontent").scrollTop(jQuery("#chatbox_"+chatboxtitle+" .chatboxcontent")[0].scrollHeight);
@@ -619,7 +619,7 @@ function drupalchatMain() {
   				if(drupalSettings.drupalchat.iup == "1") {
   				  output = output + '<div class="chatboxuserpicture"><img height="20" width="20" src="'+value.p+'" /></div>';
   				}
-  				output = output + '<span class="chatboxtime">'+formattedCurrentTime+'</span><a href="'+drupalSettings.basePath+'user/'+value.uid1+'">'+value.name+'</a></div><p class="' + value.message_id + '">'+value.message+'</p>';
+  				output = output + '<span class="chatboxtime">'+formattedCurrentTime+'</span><a href="'+drupalSettings.path.baseUrl+'user/'+value.uid1+'">'+value.name+'</a></div><p class="' + value.message_id + '">'+value.message+'</p>';
   				jQuery("#chatbox_"+chatboxtitle+" .chatboxcontent").append(output);
   			}
   			jQuery("#chatbox_"+chatboxtitle+" .chatboxcontent").scrollTop(jQuery("#chatbox_"+chatboxtitle+" .chatboxcontent")[0].scrollHeight);