diff --git a/lms/djangoapps/django_comment_client/base/views.py b/lms/djangoapps/django_comment_client/base/views.py
index 61ab28df76..70396ba064 100644
--- a/lms/djangoapps/django_comment_client/base/views.py
+++ b/lms/djangoapps/django_comment_client/base/views.py
@@ -21,7 +21,6 @@ from django.contrib.auth.models import User
 from mitxmako.shortcuts import render_to_response, render_to_string
 from courseware.courses import get_course_with_access
 
-
 from django_comment_client.utils import JsonResponse, JsonError, extract
 
 from django_comment_client.permissions import check_permissions_by_view
@@ -337,8 +336,8 @@ def upload(request, course_id):#ajax upload file to a question or answer
         # check file type
         f = request.FILES['file-upload']
         file_extension = os.path.splitext(f.name)[1].lower()
-        if not file_extension in settings.DISCUSSION_ALLOWED_UPLOAD_FILE_TYPES:
-            file_types = "', '".join(settings.DISCUSSION_ALLOWED_UPLOAD_FILE_TYPES)
+        if not file_extension in cc_settings.ALLOWED_UPLOAD_FILE_TYPES:
+            file_types = "', '".join(cc_settings.ALLOWED_UPLOAD_FILE_TYPES)
             msg = _("allowed file types are '%(file_types)s'") % \
                     {'file_types': file_types}
             raise exceptions.PermissionDenied(msg)
@@ -357,15 +356,16 @@ def upload(request, course_id):#ajax upload file to a question or answer
         # check file size
         # byte
         size = file_storage.size(new_file_name)
-        if size > settings.ASKBOT_MAX_UPLOAD_FILE_SIZE:
+        if size > cc_settings.MAX_UPLOAD_FILE_SIZE:
             file_storage.delete(new_file_name)
             msg = _("maximum upload file size is %(file_size)sK") % \
-                    {'file_size': settings.ASKBOT_MAX_UPLOAD_FILE_SIZE}
+                    {'file_size': cc_settings.MAX_UPLOAD_FILE_SIZE}
             raise exceptions.PermissionDenied(msg)
 
     except exceptions.PermissionDenied, e:
         error = unicode(e)
     except Exception, e:
+        print e
         logging.critical(unicode(e))
         error = _('Error uploading file. Please contact the site administrator. Thank you.')
 
diff --git a/lms/djangoapps/django_comment_client/settings.py b/lms/djangoapps/django_comment_client/settings.py
new file mode 100644
index 0000000000..3234c32478
--- /dev/null
+++ b/lms/djangoapps/django_comment_client/settings.py
@@ -0,0 +1,10 @@
+from django.conf import settings
+
+MAX_COMMENT_DEPTH = None
+MAX_UPLOAD_FILE_SIZE = 1024 * 1024 #result in bytes
+ALLOWED_UPLOAD_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
+
+if hasattr(settings, 'DISCUSSION_SETTINGS'):
+    MAX_COMMENT_DEPTH = settings.DISCUSSION_SETTINGS.get('MAX_COMMENT_DEPTH')
+    MAX_UPLOAD_FILE_SIZE = settings.DISCUSSION_SETTINGS.get('MAX_UPLOAD_FILE_SIZE') or MAX_UPLOAD_FILE_SIZE
+    ALLOWED_UPLOAD_FILE_TYPES = settings.DISCUSSION_SETTINGS.get('ALLOWED_UPLOAD_FILE_TYPES') or ALLOWED_UPLOAD_FILE_TYPES