diff --git a/frontend/src/uxbox/main/ui/auth/login.cljs b/frontend/src/uxbox/main/ui/auth/login.cljs
index 4e800d18c7..2b25f08c44 100644
--- a/frontend/src/uxbox/main/ui/auth/login.cljs
+++ b/frontend/src/uxbox/main/ui/auth/login.cljs
@@ -22,12 +22,6 @@
 (def form-data (forms/focus-data :login st/state))
 (def set-value! (partial forms/set-value! st/store :login))
 
-(defn- login-page-will-mount
-  [own]
-  (when @st/auth-ref
-    (st/emit! (rt/navigate :dashboard/projects)))
-  own)
-
 (def +login-form+
   {:email [forms/required forms/string]
    :password [forms/required forms/string]})
@@ -73,8 +67,11 @@
           "Don't have an account?"]]]])))
 
 (mx/defc login-page
-  {:mixins [mx/static]
-   :will-mount login-page-will-mount}
+  {:mixins [mx/static (forms/clear-mixin st/store :login)]
+   :will-mount (fn [own]
+                 (when @st/auth-ref
+                   (st/emit! (rt/navigate :dashboard/projects)))
+                 own)}
   []
   [:div.login
    [:div.login-body
diff --git a/frontend/src/uxbox/main/ui/auth/register.cljs b/frontend/src/uxbox/main/ui/auth/register.cljs
index c2ba98cc8c..1265fa0c3b 100644
--- a/frontend/src/uxbox/main/ui/auth/register.cljs
+++ b/frontend/src/uxbox/main/ui/auth/register.cljs
@@ -33,7 +33,8 @@
    :password [forms/required forms/string]})
 
 (mx/defc register-form
-  {:mixins [mx/static mx/reactive]}
+  {:mixins [mx/static mx/reactive
+            (forms/clear-mixin st/store :register)]}
   []
   (let [data (mx/react form-data)
         errors (mx/react form-errors)
diff --git a/frontend/src/uxbox/util/forms.cljs b/frontend/src/uxbox/util/forms.cljs
index e4d5cfd61c..8f69129670 100644
--- a/frontend/src/uxbox/util/forms.cljs
+++ b/frontend/src/uxbox/util/forms.cljs
@@ -39,17 +39,12 @@
   (assoc f/identical-to :message "errors.form.identical-to"))
 
 (def in-range f/in-range)
-;; (def uuid-like f/uuid-like)
 (def uuid f/uuid)
 (def keyword f/keyword)
 (def integer-str f/integer-str)
 (def number-str f/number-str)
-;; (def boolean-like f/boolean-like)
 (def email f/email)
-;; (def function f/function)
 (def positive f/positive)
-;; (def validate f/validate)
-;; (def validate! f/validate!)
 
 (def max-len
   {:message "errors.form.max-len"