diff --git a/client/index.html b/client/index.html
index d84868f..b0cc703 100644
--- a/client/index.html
+++ b/client/index.html
@@ -48,6 +48,7 @@
 								<a class="dropdown-item" href="#" onclick="setLanguage('es_ES')">Español</a>
 								<a class="dropdown-item" href="#" onclick="setLanguage('ru_RU')">русский</a>
 								<a class="dropdown-item" href="#" onclick="setLanguage('pt_BR')">Português</a>
+								<a class="dropdown-item" href="#" onclick="setLanguage('zh_CN')">中文</a>
 							</div>
 						</li>
 					</ul>
diff --git a/client/scripts/WebConsole.js b/client/scripts/WebConsole.js
index 2d451c5..bb0f05e 100644
--- a/client/scripts/WebConsole.js
+++ b/client/scripts/WebConsole.js
@@ -238,6 +238,6 @@ function updateServerList(){
 	
 	//Show a "no servers" message when no servers are added
 	if(servers.length == 0){
-		$('#ServerListDropDown').append('<a class="dropdown-item servermenuitem disabled" href="#">' + lang.noServersAdded + '</a>');
+		$('#ServerListDropDown').append('<a class="dropdown-item servermenuitem disabled" href="#" id="noServersAdded">No servers added</a>');
 	}
 }
\ No newline at end of file
diff --git a/client/scripts/WebConsoleJqueryHandler.js b/client/scripts/WebConsoleJqueryHandler.js
index b10463c..db14d3c 100644
--- a/client/scripts/WebConsoleJqueryHandler.js
+++ b/client/scripts/WebConsoleJqueryHandler.js
@@ -9,8 +9,8 @@
 */
 $(document).ready(function() {
 	$("#serverContainer").hide();
-	setLanguage(persistenceManager.getLanguage());
 	updateServerList();
+	setLanguage(persistenceManager.getLanguage());
 });
 
 /**
diff --git a/client/scripts/WebConsoleLanguage.js b/client/scripts/WebConsoleLanguage.js
index dec7b86..0cd74c6 100644
--- a/client/scripts/WebConsoleLanguage.js
+++ b/client/scripts/WebConsoleLanguage.js
@@ -132,6 +132,37 @@ function setLanguage(locale){
 				"sendCommandButton": "Enviar"
 			}
 			break;
+		case "zh_CN": //Credit to Neubulae
+			lang = {
+				"home_link": "首页",
+				"home_header": "请从菜单中选择一个服务器",
+				"home_description": "请使用导航栏以添加新服务器, 或连接至已设定服务器.",
+				"server_dropdown": "你的服务器",
+				"add_server": "添加服务器",
+				"noServersAdded": "没有添加服务器",
+				"lang_dropdown": "语言",
+				"addServerModalLongTitle": "添加一个新服务器",
+				"addServerModalSvName": "服务器名称:",
+				"addServerModalSvIp": "服务器IP地址:",
+				"addServerModalSvPort": "WebConsole端口:",
+				"addServerModalSvSsl": "服务器已开启SSL",
+				"addServerModalClose": "关闭",
+				"saveAndConnectServerButton": "保存并连接",
+				"passwordModalLongTitle": "需要密码",
+				"passwordModalLabel": "密码:",
+				"passwordModalRememberLabel": "记住密码",
+				"passwordModalCloseButton": "关闭",
+				"passwordSendButton": "登录",
+				"disconnectionModalLongTitle": "已断开",
+				"disconnectionModalDescription": "与服务器的通信中断, 可能是因为服务器停止运行. 已回到欢迎界面.",
+				"disconnectionModalCloseButton": "关闭",
+				"players_online": "在线人数",
+				"cpu_title": "CPU",
+				"ram_title": "内存使用量",
+				"deleteServerButton": "关闭服务器",
+				"sendCommandButton": "发送"
+			}
+			break;
 		default:
 			console.error("No language set");
 	}
@@ -141,6 +172,7 @@ function setLanguage(locale){
 	document.getElementById("home_description").textContent = lang.home_description;
 	document.getElementById("serversDropdown").textContent = lang.server_dropdown;
 	document.getElementById("add_server").textContent = lang.add_server;
+	document.getElementById("noServersAdded").textContent = lang.noServersAdded;
 	document.getElementById("lang_dropdown").textContent = lang.lang_dropdown;
 	document.getElementById("addServerModalLongTitle").textContent = lang.addServerModalLongTitle;
 	document.getElementById("addServerModalSvName").textContent = lang.addServerModalSvName;