diff --git a/login.html b/login.html
index e38dfde4..60e011f5 100644
--- a/login.html
+++ b/login.html
@@ -39,6 +39,7 @@ if(process.platform != 'darwin') {
 	<section id="box">
 		<div class="drag"></div>
 		<div>
+			<div class="faq" onclick="openExternal('https://github.com/leanote/desktop-app/issues/225')"><i class="fa fa-question-circle"></i></div>
 			<h1 id="logo">
 				<a onclick="openExternal('https://leanote.com')" id="loadingLogo" title="leanote">
 					<span class="logo"></span>
diff --git a/note.html b/note.html
index b8794508..8e583ccd 100755
--- a/note.html
+++ b/note.html
@@ -644,9 +644,9 @@ function log(o) {
 
 <script src="public/config.js"></script>
 <script src="public/js/jquery-1.9.0.min.js"></script>
-<script src="public/js/lang.js"></script>
 <script src="public/js/jquery.ztree.all-3.5.js"></script>
 <script src="public/js/app/service.js"></script>
+<script src="public/js/lang.js"></script>
 <script src="public/js/common.js"></script>
 <script>
 var UrlPrefix = 'app://leanote';
diff --git a/public/css/login.less b/public/css/login.less
index 456871ce..b70fd534 100644
--- a/public/css/login.less
+++ b/public/css/login.less
@@ -854,3 +854,15 @@ body.loading {
 		display: inline;
 	}
 }
+
+.faq {
+	position: fixed;
+	top: 2px;
+	right: 8px;
+	cursor: pointer;
+	color: #aaa;
+	z-index: 1000;
+	&:hover {
+		color: #000;
+	}
+}
diff --git a/public/js/lang.js b/public/js/lang.js
index fbc2ae27..5fc4f7ff 100644
--- a/public/js/lang.js
+++ b/public/js/lang.js
@@ -15,10 +15,20 @@ var lang = {
 	// 读取语言, 修改html
 	init: function() {
 		var me = this;
-		var curLang = Config['lang'] || 'en-us';
+		var defaultLang = 'en-us';
+
+		var sysLang = app.getLocale();
+		if (sysLang) {
+			sysLang = sysLang.toLowerCase();
+		}
+
+		var curLang = Config['lang'] || sysLang || defaultLang;
 		langData = me.readJson('public/langs/' + curLang + '.js');
 		if(!langData) {
-			return;
+			langData = me.readJson('public/langs/' + defaultLang + '.js');
+			if (!langData) {
+				return;
+			}
 		}
 		// 设为全局
 		window.curLang = curLang;