diff --git a/templates/themes/irc/info.php b/templates/themes/irc/info.php
index 59ff4bd6..8ca3be0a 100644
--- a/templates/themes/irc/info.php
+++ b/templates/themes/irc/info.php
@@ -22,7 +22,17 @@ $theme = array(
         array('title'   => 'Channel',
               'name'    => 'channel',
               'type'    => 'text',
-              'default' => 'lainchan')),
+              'default' => 'general'),
+        
+        array('title'   => 'Server',
+              'name'    => 'server',
+              'type'    => 'text',
+              'default' => 'irc.lainchan.org'),
+	
+	array('title'   => 'Port',
+              'name'    => 'port',
+              'type'    => 'text',
+              'default' => '6697')),
 
     'build_function'   => 'irc_build');
 ?>
diff --git a/templates/themes/irc/irc.html b/templates/themes/irc/irc.html
index 1766f426..7aa617cf 100644
--- a/templates/themes/irc/irc.html
+++ b/templates/themes/irc/irc.html
@@ -22,8 +22,8 @@
 
 
     <div class="ban" style="text-align: left!important;">
-        <h2>Web Client - Point your own clients to #{{ settings.channel }} on irc.freenode.net.</h2>		
-        <iframe src="https://webchat.freenode.net?channels=%23{{ settings.channel }}&uio=MTE9MTMz98" width="766" height="400"></iframe>
+        <h2>Web Client - Point your own clients to #{{ settings.channel }} on {{ settings.server }}:+{{ settings.port }} .</h2>		
+        <iframe src="https://kiwiirc.com/client/{{ settings.server }}:+{{ settings.port }}/#{{ settings.channel }}" width="800px" height="100%" scrolling="no"></iframe>
     </div>
   </body>
 </html>