diff --git a/src/main/resources/templates/sign-in.html b/src/main/resources/templates/sign-in.html
@@ -41,6 +41,10 @@
                 <span>Вие успешно излязохте от акаунта си</span>
             </div>
 
+            <div th:if="${param.changed}" class="alert-success">
+                <span>Вие успешно променихте паролата си</span>
+            </div>
+
             <!-- Material input email -->
             <div class="md-form form-lg">
                 <i id="email-icon" class="fa fa-envelope prefix"></i>
@@ -62,7 +66,7 @@
                 </div>
             </div>
 
-            <a href="" class="link-sign-in" id="forgot-password">Забравена парола</a>
+            <a href="/forgot-password" class="link-sign-in" id="forgot-password">Забравена парола</a>
 
             <div class="text-center mt-4 btn-lg">
                 <a>

diff --git a/src/main/webapp/static/js/forgot-password.js b/src/main/webapp/static/js/forgot-password.js
@@ -0,0 +1,31 @@
+$(".form-register-design").submit(function(event) {
+  event.preventDefault();
+
+  var email = $("#email").val();
+
+  $("#forgot-password-btn").html(
+    'Продължи <i class="fas fa-circle-notch fa-spin"></i>'
+  );
+
+  $.ajax({
+    url: "/api/forgot-password?email=" + email,
+    method: "GET",
+    success: function(result) {
+      $("#forgot-password-btn").html("Продължи");
+
+      if (result) {
+        iziToast.success({
+          title: "ОК!",
+          message: "Имейл беше изпратен на посочения адрес",
+          position: "topRight"
+        });
+      } else {
+        iziToast.error({
+          title: "Грешка!",
+          message: "Възникна грешка",
+          position: "topRight"
+        });
+      }
+    }
+  });
+});
diff --git a/src/main/webapp/static/js/reset-password.js b/src/main/webapp/static/js/reset-password.js
@@ -0,0 +1,32 @@
+var arr = window.location.pathname.split("/");
+var id = arr[arr.length - 1];
+
+$(".form-register-design").submit(function(event) {
+  event.preventDefault();
+
+  var password = $("#password").val();
+  var repassword = $("#repassword").val();
+
+  if (password === repassword) {
+    $("#reset-password-btn").html(
+      'Промени <i class="fas fa-circle-notch fa-spin"></i>'
+    );
+
+    $.ajax({
+      url: "/api/reset-password?password=" + password + "&id=" + id,
+      method: "GET",
+      success: function(result) {
+        $("#reset-password-btn").html(
+          'Промени'
+        );
+        window.location.href = "/sign-in?changed";
+      }
+    });
+  } else {
+    iziToast.error({
+      title: "Грешка!",
+      message: "Паролите не съвпадат",
+      position: "topRight"
+    });
+  }
+});
diff --git a/wysiwyg-editor-java-sdk.jar b/wysiwyg-editor-java-sdk.jar