diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 13ffcb1..ce3020e 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,9 +21,7 @@
   <component name="ChangeListManager">
     <list default="true" id="fc13552d-b118-4828-b78f-fc8714e0cfdc" name="Default Changelist" comment="Final COMMIT!!!">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/controller/FaqController.class.inc.php" beforeDir="false" afterPath="$PROJECT_DIR$/controller/FaqController.class.inc.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/model/FaqModel.class.inc.php" beforeDir="false" afterPath="$PROJECT_DIR$/model/FaqModel.class.inc.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/Apitemplate.class.inc.php" beforeDir="false" afterPath="$PROJECT_DIR$/views/Apitemplate.class.inc.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/vendor/js/faq.js" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/js/faq.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -34,7 +32,7 @@
     <execution />
   </component>
   <component name="DarkyenusTimeTracker">
-    <option name="totalTimeSeconds" value="93042" />
+    <option name="totalTimeSeconds" value="93281" />
     <option name="gitIntegration" value="true" />
     <option name="naggedAbout" value="1" />
   </component>
@@ -80,7 +78,7 @@
       <updated>1601618466935</updated>
       <workItem from="1601618467981" duration="36776000" />
       <workItem from="1601809534320" duration="1558000" />
-      <workItem from="1601811106543" duration="27722000" />
+      <workItem from="1601811106543" duration="28096000" />
     </task>
     <task id="LOCAL-00001" summary="Initial commit">
       <created>1601618764031</created>
@@ -334,7 +332,14 @@
       <option name="project" value="LOCAL" />
       <updated>1601919457161</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="Add room lock">
+      <created>1601922350102</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1601922350102</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -353,7 +358,6 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="&#10;Updating database-conf" />
     <MESSAGE value="Final COMMIT!!!" />
     <MESSAGE value="Fix issue #1" />
     <MESSAGE value="Done issue #5 and #3" />
@@ -378,7 +382,8 @@
     <MESSAGE value="Update optionsModal" />
     <MESSAGE value="increase answer size" />
     <MESSAGE value="Correct spelling" />
-    <option name="LAST_COMMIT_MESSAGE" value="Correct spelling" />
+    <MESSAGE value="Add room lock" />
+    <option name="LAST_COMMIT_MESSAGE" value="Add room lock" />
   </component>
   <component name="WindowStateProjectService">
     <state x="728" y="326" width="800" height="683" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1601632929047">
@@ -417,10 +422,10 @@
       <screen x="0" y="34" width="1920" height="1046" />
     </state>
     <state x="441" y="192" width="1037" height="736" key="SettingsEditor/0.34.1920.1046@0.34.1920.1046" timestamp="1601632853044" />
-    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2" timestamp="1601919458785">
+    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2" timestamp="1601922351176">
       <screen x="0" y="34" width="1920" height="1046" />
     </state>
-    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2/0.34.1920.1046@0.34.1920.1046" timestamp="1601919458785" />
+    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2/0.34.1920.1046@0.34.1920.1046" timestamp="1601922351176" />
     <state x="809" y="122" width="639" height="876" key="com.intellij.database.view.ui.AbstractDbRefactoringDialog" timestamp="1601632983240">
       <screen x="0" y="34" width="1920" height="1046" />
     </state>
diff --git a/vendor/js/faq.js b/vendor/js/faq.js
index 86259da..d3b6b9a 100644
--- a/vendor/js/faq.js
+++ b/vendor/js/faq.js
@@ -99,6 +99,9 @@ function askQuestion()
                 case 903:
                     askErrorMsg.html( "The question should contain at least 10 up to 500 characters!<br>The nickname should contain at least 3 up to 20 characters!" );
                     break;
+                case 910:
+                    askErrorMsg.html( "The Room is locked.<br>You cannot ask/answer questions anymore!" );
+                    break;
                 default:
                     $('.modal').modal('hide');
                     setTimeout( function( result ){
@@ -197,6 +200,9 @@ function answer()
             case 905:
                 answerErrorMsg.html( 'You are not allowed to answer questions!' );
                 break;
+            case 910:
+                answerErrorMsg.html( "The Room is locked.<br>You cannot ask/answer questions anymore!" );
+                break;
             default:
                 answerErrorMsg.html( 'An error occurred. Please try again later!' );
         }