diff --git a/core/bbs.js b/core/bbs.js
index 5f4c006c..0cc83794 100644
--- a/core/bbs.js
+++ b/core/bbs.js
@@ -193,7 +193,8 @@ function startListening() {
 				client.session = {};
 			}
 
-			client.session.serverType = moduleInst.getServerType();
+			client.session.serverName 	= module.moduleInfo.name;
+			client.session.isSecure		= module.moduleInfo.isSecure || false;
 
 			clientConns.addNewClient(client, clientSock);
 
diff --git a/core/client_connections.js b/core/client_connections.js
index 0caea71e..e07a5644 100644
--- a/core/client_connections.js
+++ b/core/client_connections.js
@@ -22,7 +22,8 @@ function addNewClient(client, clientSock) {
 
 	var connInfo = {
 		ip			: clientSock.remoteAddress,
-		serverType	: client.session.serverType,
+		serverName	: client.session.serverName,
+		isSecure	: client.session.isSecure,
 	};
 
 	if(client.log.debug()) {
diff --git a/core/predefined_mci.js b/core/predefined_mci.js
index bf7bf544..edd306b0 100644
--- a/core/predefined_mci.js
+++ b/core/predefined_mci.js
@@ -54,7 +54,7 @@ function getPredefinedMCIValue(client, code) {
 			UC	: function loginCount() { return client.user.properties.login_count.toString(); },
 			ND	: function connectedNode() { return client.node.toString(); },
 			IP	: function clientIpAddress() { return client.address().address; },
-			ST	: function serverType() { return client.session.serverType; },
+			ST	: function serverName() { return client.session.serverName; },
 
 			MS	: function accountCreated() { return moment(client.user.properties.account_created).format(client.currentTheme.helpers.getDateFormat()); },
 			CS	: function currentStatus() { return client.currentStatus; },
diff --git a/core/server_module.js b/core/server_module.js
index 040beb19..d1b8ccc6 100644
--- a/core/server_module.js
+++ b/core/server_module.js
@@ -13,6 +13,3 @@ require('util').inherits(ServerModule, PluginModule);
 
 ServerModule.prototype.createServer = function() {
 };
-
-ServerModule.prototype.getServerType = function() {	
-};
diff --git a/core/servers/ssh.js b/core/servers/ssh.js
index bf549374..8b8d01bd 100644
--- a/core/servers/ssh.js
+++ b/core/servers/ssh.js
@@ -16,9 +16,10 @@ var _				= require('lodash');
 var assert			= require('assert');
 
 exports.moduleInfo = {
-	name	: 'SSH',
-	desc	: 'SSH Server',
-	author	: 'NuSkooler'
+	name		: 'SSH',
+	desc		: 'SSH Server',
+	author		: 'NuSkooler',
+	isSecure	: true,
 };
 
 exports.getModule		= SSHServerModule;
@@ -232,7 +233,3 @@ SSHServerModule.prototype.createServer = function() {
 
 	return server;
 };
-
-SSHServerModule.prototype.getServerType = function() {
-	return 'SSH';
-};
\ No newline at end of file
diff --git a/core/servers/telnet.js b/core/servers/telnet.js
index 487879e1..7e65cdd9 100644
--- a/core/servers/telnet.js
+++ b/core/servers/telnet.js
@@ -16,9 +16,10 @@ var util			= require('util');
 //var debug	= require('debug')('telnet');
 
 exports.moduleInfo = {
-	name	: 'Telnet',
-	desc	: 'Telnet Server',
-	author	: 'NuSkooler'
+	name		: 'Telnet',
+	desc		: 'Telnet Server',
+	author		: 'NuSkooler',
+	isSecure	: false,
 };
 
 exports.getModule	= TelnetServerModule;
@@ -785,7 +786,3 @@ TelnetServerModule.prototype.createServer = function() {
 
 	return server;
 };
-
-TelnetServerModule.prototype.getServerType = function() {
-	return 'TELNET';
-};