diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0650db1cf..c4bbc4ebb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2727,6 +2727,10 @@ int main(int argc, char** argv){
     opt = {enable_at: false, prettify: false, init_activity: false}.merge default_opt
     ss  = ''
 
+    unless Setting.at_enabled?
+      opt[:enable_at] = false
+    end
+
     ss += javascript_include_tag("/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg')
     if opt[:enable_at]
       ss += javascript_include_tag('/assets/kindeditor/at/jquery.caret.min.js', '/assets/kindeditor/at/jquery.atwho.js', '/assets/kindeditor/at/config.js')
diff --git a/config/settings.yml b/config/settings.yml
index 4286e0930..611ba8138 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -279,3 +279,5 @@ plugin_redmine_ckeditor:
   toolbar_can_collapse: '0'
   toolbar_location: top
   toolbar: Source,ShowBlocks,--,Undo,Redo,-,Find,Replace,--,Bold,Italic,Underline,Strike,-,Subscript,Superscript,-,NumberedList,BulletedList,-,Outdent,Indent,Blockquote,-,JustifyLeft,JustifyCenter,JustifyRight,JustifyBlock,-,Link,Unlink,-,richImage,Table,HorizontalRule,/,Styles,Format,Font,FontSize,-,TextColor,BGColor
+at_enabled:
+  default: 1