diff --git a/frontend/api/class.ApiLogin.php b/frontend/api/class.ApiLogin.php
index e937fe4f8..59b894312 100644
--- a/frontend/api/class.ApiLogin.php
+++ b/frontend/api/class.ApiLogin.php
@@ -620,7 +620,7 @@ class ApiLogin
             if (validEmail($this->email)) {
                 if($this->method == 'AJAX'){
 
-                    return $this->ajaxResponse('error', $lang['cms_error_missing_email']);
+                    return $this->ajaxResponse('error', $lang['cms_error_email_or_password_doesnt_exist']);
 
                 }else{
                     // Emaila ni v bazi
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-block.html.twig b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-block.html.twig
index 3b8d32c26..23066203f 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-block.html.twig
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-block.html.twig
@@ -81,6 +81,9 @@
                             <div class="col _3-3-3-12">
                                 <label>{{ lang['email'] }}</label>
                                 <input type="text" id="em" class="input-field w-input {{ (email == 'error' ? "error-field" : "")  }}" name="email" value="{{ (email != 'error' ? email : null) }}" size="30" onClick="this.value=\'\'" required="required"/>
+                                <div class="error error-empty">
+                                  {{ lang['cms_error_missing_email'] }}
+                                </div>
                             </div>
                         </div>
 
@@ -88,6 +91,9 @@
                             <div class="col _3-3-3-12">
                                 <label>{{ lang['password'] }}</label>
                                 <input type="password" name="pass" class="input-field prijava-password-input w-input {% if(email == 'error' or password) %}error-field{% endif %}" size="30" required="required"/>
+                                <div class="error error-empty">
+                                  {{ lang['cms_error_password_emtpy'] }}
+                                </div>
                             </div>
                         </div>
 
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig
index 34ebd36f3..5090671ad 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig
@@ -6,9 +6,9 @@
   {#        // Naslov#}
           <div class="row">
             <div class="col">
-              <h4 id="login-google-title">{{ lang['login_with_google'] }}</h4>
-              <h4 id="login-facebook-title">{{  lang['login_with_facebook'] }}</h4>
-              <h4 id="login-aai-title">{{ lang['login_with_aai_title'] }}</h4>
+              <h4 id="login-google-title" class="external-login-title">{{ lang['login_with_google'] }}</h4>
+              <h4 id="login-facebook-title" class="external-login-title">{{  lang['login_with_facebook'] }}</h4>
+              <h4 id="login-aai-title" class="external-login-title">{{ lang['login_with_aai_title'] }}</h4>
             </div>
           </div>
 
diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.libraries.yml b/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.libraries.yml
index 7f2d47409..1405dc202 100644
--- a/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.libraries.yml
+++ b/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.libraries.yml
@@ -4,4 +4,3 @@ registracija_1ka.library:
     #js/registracija_1ka_script.js: {}
   dependencies:
     - core/jquery
-s
diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig b/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig
index 07c364909..acc2ca5aa 100644
--- a/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig
+++ b/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig
@@ -27,10 +27,16 @@
                                 <div class="left_col">
                                     <label>{{ lang['email'] }}</label>
                                     <input type="email" class="input-field w-input {% if obvestila['error_email'] %} error-field {% endif %}" name="email" onchange="InsertName();" onblur="CheckEmail(\'{{ lang['cms_register_user_email_incorrect'] }}\');CheckEmailTypo(\'{{ lang['cms_register_user_typo_email'] }}\')" value="{% if parametri['email'] %} {{ parametri['email'] }} {% endif %}">
+                                    <div class="error error-empty">
+                                      {{ lang['cms_error_missing_email'] }}
+                                    </div>
                                 </div>
                                 <div class="right_col">
                                     <label>{{ lang['cms_register_user_nickname'] }}</label>
                                     <input type="text" id="registracija-vzdevek" class="input-field w-input {% if obvestila['error_ime'] %} error-field {% endif %}" name="ime" value="{% if parametri['ime'] %} {{ parametri['ime'] }} {% endif %}">
+                                    <div class="error error-empty">
+                                      {{ lang['cms_error_user_field_empty'] }}
+                                    </div>
                                 </div>
                             </div>
 
@@ -38,10 +44,16 @@
                                 <div class="left_col">
                                     <label>{{ lang['cms_register_user_password'] }}</label>
                                     <input type="password" class="input-field w-input  {% if obvestila['error_geslo'] %} error-field {% endif %}" value="" id="geslo" name="geslo">
+                                    <div class="error error-empty">
+                                      {{ lang['cms_error_password_emtpy'] }}
+                                    </div>
                                 </div>
                                 <div class="right_col">
                                     <label>{{ lang['cms_register_user_repeat_password'] }}</label>
                                     <input type="password" class="input-field w-input  {% if obvestila['error_geslo'] %} error-field {% endif %}" value="" id="geslo2" name="geslo2">
+                                  <div class="error error-empty">
+                                    {{ lang['cms_error_password_cofirm_empty'] }}
+                                  </div>
                                 </div>
                             </div>
 
@@ -52,6 +64,10 @@
                                 <div class="w-clearfix">
                                     <div style="margin-bottom: 10px;">
                                         <div class="g-recaptcha" data-sitekey="{{ recaptcha_sitekey }}"></div>
+
+                                      <div class="error error-empty">
+                                        {{ lang['cms_error_password_cofirm_empty'] }}
+                                      </div>
                                     </div>
                                 </div>
                             {% endif %}
@@ -71,7 +87,11 @@
                                         <span class="checkbox-display {% if obvestila['missing_agree'] %} error-field {% endif %}"></span>
                                         <span id="agreelabel" {% if obvestila['missing_agree'] %} error-field {% endif %}>
                                             <label for="IAgree" class="checkbox-label w-form-label">
-                                                {{ lang['cms_register_user_terms_of_use'] | raw }}</label>
+                                                {{ lang['cms_register_user_terms_of_use'] | raw }}
+                                            </label>
+                                          <div class="error error-empty">
+                                            {{ lang['cms_error_agree_emtpy'] }}
+                                          </div>
                                         </span>
                                     </div>
 
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
index 5e983dd69..d2ceaff48 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
+++ b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
@@ -1319,6 +1319,17 @@ ul.seznam-tem li.prirocnik a {
 .modal .modal-box .w-input.error, .rexister-modal .modal-box .w-input.error {
   border-color: red;
 }
+.modal .modal-box #registracija-uporabnika .w-input, .modal .modal-box #forma-prijava .w-input, .rexister-modal .modal-box #registracija-uporabnika .w-input, .rexister-modal .modal-box #forma-prijava .w-input {
+  margin-bottom: 0px;
+}
+.modal .modal-box #registracija-uporabnika .left_col, .modal .modal-box #registracija-uporabnika .right_col, .modal .modal-box #registracija-uporabnika ._3-3-3-12, .modal .modal-box #forma-prijava .left_col, .modal .modal-box #forma-prijava .right_col, .modal .modal-box #forma-prijava ._3-3-3-12, .rexister-modal .modal-box #registracija-uporabnika .left_col, .rexister-modal .modal-box #registracija-uporabnika .right_col, .rexister-modal .modal-box #registracija-uporabnika ._3-3-3-12, .rexister-modal .modal-box #forma-prijava .left_col, .rexister-modal .modal-box #forma-prijava .right_col, .rexister-modal .modal-box #forma-prijava ._3-3-3-12 {
+  margin-bottom: 16px;
+}
+.modal .modal-box #registracija-uporabnika .error-empty, .modal .modal-box #forma-prijava .error-empty, .rexister-modal .modal-box #registracija-uporabnika .error-empty, .rexister-modal .modal-box #forma-prijava .error-empty {
+  display: none;
+  font-style: italic;
+  font-size: 14px;
+}
 .modal .modal-box .w-checkbox, .rexister-modal .modal-box .w-checkbox {
   margin-bottom: 16px;
 }
@@ -1516,6 +1527,15 @@ ul.seznam-tem li.prirocnik a {
 .modal .w-form, .rexister-modal .w-form {
   margin: 0;
 }
+.modal #submit-other-login,
+.modal #login-google-title,
+.modal #login-facebook-title,
+.modal #login-aai-title, .rexister-modal #submit-other-login,
+.rexister-modal #login-google-title,
+.rexister-modal #login-facebook-title,
+.rexister-modal #login-aai-title {
+  display: none;
+}
 
 .dva-stolpca {
   display: flex;
@@ -1613,6 +1633,8 @@ ul.seznam-tem li.prirocnik a {
 }
 .dva-stolpca .error-message.napaka-registracija {
   margin-right: 10px;
+  width: 100%;
+  margin-left: 0;
 }
 .dva-stolpca .intro-modal {
   display: flex;
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/login.js b/frontend/drupal9/web/themes/custom/pro1ka/js/login.js
index fc97325bf..073747c59 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/js/login.js
+++ b/frontend/drupal9/web/themes/custom/pro1ka/js/login.js
@@ -28,6 +28,17 @@
       odpriAaiLoginObvestilo();
     });
 
+    jQuery('.nakup-brez-registracije').on('click', function () {
+      var paket = jQuery(this).attr('data-paket');
+
+      var cas = new Date();
+      cas.setMinutes(cas.getMinutes() + 120);
+      document.cookie = "nakup=1;expires=" + cas + ";path=/";
+      document.cookie = "paket=" + paket + ";expires=" + cas + ";path=/";
+
+      odpriAaiLoginObvestilo();
+    });
+
     // Drupal nova prijava
     jQuery('#forma-prijava .submit-prijava').on('click', function(){
       izvediPrijavoUporabnika();
@@ -163,18 +174,27 @@
     jQuery('#registracija-uporabnika .submit-btn').on('click', function (event) {
       jQuery('.error-field').removeClass('error-field');
       jQuery('.error').removeClass('error');
+      jQuery('.error-empty, .error-message').hide();
 
       // Obravnamo manjkajoča polja
       if (jQuery('#register-form [name="email"]').val().length < 2) {
-        jQuery('#register-form [name="email"]').addClass('error error-field');
+        jQuery('#register-form [name="email"]').addClass('error error-field').siblings('.error-empty').addClass('error').show();
       }
 
       if (jQuery('#register-form [name="ime"]').val().length < 2) {
-        jQuery('#register-form [name="ime"]').addClass('error error-field');
+        jQuery('#register-form [name="ime"]').addClass('error error-field').siblings('.error-empty').addClass('error').show();
+      }
+
+      if (jQuery('#register-form #geslo').val().length < 2) {
+        jQuery('#register-form #geslo').addClass('error error-field').siblings('.error-empty').addClass('error').show();
+      }
+
+      if (jQuery('#register-form #geslo2').val().length < 2) {
+        jQuery('#register-form #geslo2').addClass('error error-field').siblings('.error-empty').addClass('error').show();
       }
 
       if (!jQuery('#register-form [name="agree"]').is(':checked')) {
-        jQuery('#register-form [name="agree"]').addClass('error').siblings('#agreelabel, .checkbox-display').addClass('error');
+        jQuery('#register-form [name="agree"]').addClass('error').siblings('#agreelabel, .checkbox-display').addClass('error').find('.error-empty').addClass('error').show();
       }
 
 
@@ -366,11 +386,12 @@ function izvediPrijavoUporabnika()
 {
   // ODstranimo vse napake
   jQuery('.error-field').removeClass('error-field');
+  jQuery('.error-empty, .error-message').hide();
 
 
   jQuery(':input[required]:visible').each(function () {
     if (jQuery(this).val() == '') {
-      jQuery(this).addClass('error-field');
+      jQuery(this).addClass('error-field').siblings('.error-empty').addClass('error').show();
     }
   });
 
@@ -622,8 +643,6 @@ function CookieAlert(link, jezik, url) {
         </form>
 */
 function CookieAlertGoogle(jezik, url) {
-  //console.log('sa', link, jezik);
-
   //var link = link || '/';
   var jezik = jezik || 'sl';
   var url = url || false;
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
index 0ae57b7d7..9c0ea69f4 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
+++ b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
@@ -319,8 +319,11 @@
         });
 
         jQuery('.ikona-custom-login').on('click', function () {
+          jQuery('.external-login-title').hide();
+
           var atribut = jQuery(this).attr('data-login');
 
+
           jQuery('#submit-other-login').css('visibility', 'hidden');
 
           jQuery('.rexister-modal').hide();
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss
index d59f72fcf..17c7381ac 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss
+++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss
@@ -64,7 +64,7 @@
     .checkbox-field{
       padding-left: 0;
       margin-bottom: 16px;
-  
+
       input{
         width: 18px;
         height: 18px;
@@ -73,7 +73,7 @@
         margin-top: 4px;
         margin-right: 5px;
       }
-  
+
       label{
         font-weight: 400;
       }
@@ -109,6 +109,22 @@
       }
     }
 
+    #registracija-uporabnika, #forma-prijava{
+      .w-input{
+        margin-bottom: 0px;
+      }
+
+      .left_col, .right_col, ._3-3-3-12{
+        margin-bottom: 16px;
+      }
+
+      .error-empty{
+        display: none;
+        font-style: italic;
+        font-size: 14px;
+      }
+    }
+
     .w-checkbox{
       margin-bottom: 16px;
       input{
@@ -351,6 +367,13 @@
   .w-form{
     margin: 0;
   }
+
+  #submit-other-login,
+  #login-google-title,
+  #login-facebook-title,
+  #login-aai-title {
+    display: none;
+  }
 }
 
 .dva-stolpca {
@@ -473,6 +496,8 @@
 
     &.napaka-registracija{
       margin-right: 10px;
+      width: 100%;
+      margin-left: 0;
     }
   }
 
@@ -733,7 +758,7 @@
         p.besedilo{
           margin-bottom: 0;
         }
-  
+
         .submit-btn{
           max-width: unset;
           margin: 25px 0;
@@ -758,7 +783,7 @@
 
           .ikona-custom-login{
             max-width: unset;
-  
+
             .op-gumb{
               margin-left: 0 !important;
               max-width: unset;
@@ -802,4 +827,4 @@
 
 @media screen and (max-width: 479px) {
 
-}
\ No newline at end of file
+}
diff --git a/lang/1.php b/lang/1.php
index 14981b599..f5c33f377 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1663,15 +1663,19 @@ $lang = array (
 	"cms_register_confirm_password" => "Da",
 	"cms_register_confirm_no_password" => "Brez gesla",
   "cms_register_confirm_notification" => "Obveščanje",
-	"cms_error_missing_email" => "Polje za vpis elektronskega naslova je obvezno.",
+	"cms_error_missing_email" => "Polje za vpis e-mail naslova je obvezno.",
 	"cms_error_email" => "Vpisan elektronski naslov ni zapisan v pravi obliki (ime.priimek@email.si) ali je neveljaven.",
+	"cms_error_email_or_password_doesnt_exist" => "Vnesli ste napačen e-mail naslov ali geslo.",
 	"cms_error_email_took" => "Uporabnik s tem elektronskim naslovom je že registriran na strani. Če ste pozabili geslo, ga lahko <a href='RESTORE_PASSWORD'>obnovite</a>.",
 	"cms_error_user_field_empty" => "Polje za vpis imena mora biti izpolnjeno.",
 	"cms_error_user_took" => "Izbrano ime (vzdevek) je že zasedeno. V polje smo vnesli podobno, a prosto ime.",
 	"cms_error_recaptcha" => "reCAPTCHA polje ni bilo izpolnjeno ali je bilo neveljavno izpolnjeno",
 	"cms_error_password_incorrect" => "Gesli se ne ujemata. Ponovno vnesite geslo.",
 	"cms_error_password" => "Vpisano geslo ni pravilno.",
+	"cms_error_password_emtpy" => "Polje za vpis gesla je obvezno.",
+	"cms_error_password_cofirm_empty" => "Polje za vpis ponovitev gesla je obvezno.",
 	"cms_error_wrong_email" => "Neveljaven elektronski naslov.",
+	"cms_error_agree_emtpy" => "Za registracijo je obvezno strinjanje s pogoji uporabe. ",
 	"cms_error_user_ban" => "Uporabnik je blokiran in prijava ni mogoča.",
 	"cms_error_no_email" => "Uporabnik še ni <a href=\"#\" id=\"odpri-registracijo\">registriran</a>.",
 	"cms_reset_password" => "Obnovitev gesla",
diff --git a/lang/2.php b/lang/2.php
index 50d5dd463..2f26f76c0 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1646,15 +1646,19 @@ $lang = array (
 	"cms_register_confirm_password" => "Yes",
 	"cms_register_confirm_no_password" => "No password",
   "cms_register_confirm_notification" => "Notification",
-	"cms_error_missing_email" => "Email field is required.",
+	"cms_error_missing_email" => "The e-mail address field is required.",
 	"cms_error_email" => "Email is not written in the correct from (firstname.lastname@mail.com) or is invalid.",
+    "cms_error_email_or_password_doesnt_exist" => "Incorrect email address or password.",
 	"cms_error_email_took" => "User with this email is already registered. If you have forgotten your password, you can <a href='RESTORE_PASSWORD'>restore it</a>",
 	"cms_error_user_field_empty" => "Name field must be filled in.",
 	"cms_error_user_took" => "The selected name (username) is already taken. You have new free name in the field.",
 	"cms_error_recaptcha" => "reCAPTCHA field has not been filled or is invalid",
 	"cms_error_password_incorrect" => "Passwords do not match. Re-enter your password.",
 	"cms_error_password" => "Password is incorrect.",
+    "cms_error_password_emtpy" => "The password field is required.",
+    "cms_error_password_cofirm_empty" => "The repeat password field is required.",
 	"cms_error_wrong_email" => "Invalid email.",
+    "cms_error_agree_emtpy" => "To sign up, you must agree to the user agreement.",
 	"cms_reset_password" => "Password reset",
   "cms_reset_password_text" => "Please enter your email address with which you are logged in and we will send you a password recovery link.",
 	"cms_error_user_ban" => "User has been banned and can not login.",