diff --git a/assets/js/opalestate.js b/assets/js/opalestate.js
index 2b0a7761..7ed5b370 100755
--- a/assets/js/opalestate.js
+++ b/assets/js/opalestate.js
@@ -1,8 +1,4 @@
 jQuery( document ).ready( function ( $ ) {
-
-    /**
-     *
-     */
     $( '#show-user-sidebar-btn' ).click( function () {
         $( 'body' ).toggleClass( 'active' );
     } );
@@ -313,8 +309,7 @@ jQuery( document ).ready( function ( $ ) {
     /**
      * Login form
      **/
-    $( 'body' ).delegate( '.opalestate-mfp-popup form.opalestate-login-form', 'submit', function () {
-
+    $( 'form.opalestate-login-form' ).on( 'submit', function () {
         var $form = $( this );
         $.ajax( {
             type: 'POST',
@@ -331,17 +326,15 @@ jQuery( document ).ready( function ( $ ) {
                     $form.find( '.opalestate-notice' ).remove();
                     $form.prepend( data.message );
                 }
-
             }
         } );
         return false;
     } );
 
     /**
-     * Login form
+     * Register form
      **/
-    $( 'body' ).delegate( '.opalestate-mfp-popup form.opalestate-register-form', 'submit', function () {
-
+    $( 'form.opalestate-register-form' ).on( 'submit', function () {
         var $form = $( this );
         $.ajax( {
             type: 'POST',
@@ -358,11 +351,11 @@ jQuery( document ).ready( function ( $ ) {
                     $form.find( '.opalestate-notice' ).remove();
                     $form.prepend( data.message );
                 }
-
             }
         } );
         return false;
     } );
+
     /**
      * AJAX ACTION
      */
diff --git a/assets/opalestate.css b/assets/opalestate.css
index 2e837ee8..73b7aaad 100755
--- a/assets/opalestate.css
+++ b/assets/opalestate.css
@@ -3997,3 +3997,7 @@ header#masthead {
     background: #2f73e9;
     position: absolute;
     top: 0; }
+
+  .opalestate-notice {
+    padding: 10px;
+  }