diff --git a/frontend/payments/classes/class.UserNarocilaPaypal.php b/frontend/payments/classes/class.UserNarocilaPaypal.php
index e8a855400..7b89c6594 100644
--- a/frontend/payments/classes/class.UserNarocilaPaypal.php
+++ b/frontend/payments/classes/class.UserNarocilaPaypal.php
@@ -124,6 +124,7 @@ class UserNarocilaPaypal{
     // Posljemo podatke za placilo paypalu
     private function paypalCreateOrder($orderDetails){
         global $site_url;
+        global $lang;
 
         $response = array();
 
@@ -132,6 +133,15 @@ class UserNarocilaPaypal{
         $request->prefer('return=representation');
         //$request->headers["prefer"] = "return=representation";
 
+        if($lang['id'] == '2'){
+            $drupal_url_confirm = $site_url.'/d/en/paypal-purchase/success?narocilo_id='.$orderDetails['narocilo_id'];
+            $drupal_url_cancel = $site_url.'/d/en/paypal-purchase/cancel?narocilo_id='.$orderDetails['narocilo_id'];
+        }
+        else{
+            $drupal_url_confirm = $site_url.'/d/narocilo/paypal?narocilo_id='.$orderDetails['narocilo_id'];
+            $drupal_url_cancel = $site_url.'/d/narocilo/paypal-cancel?narocilo_id='.$orderDetails['narocilo_id'];
+        }
+
         $request->body = [
             "intent" => "CAPTURE",
             "purchase_units" => [[
@@ -144,8 +154,8 @@ class UserNarocilaPaypal{
                 ]
             ]],
             "application_context" => [
-                "cancel_url" => $site_url . '/d/narocilo/paypal-cancel?narocilo_id='.$orderDetails['narocilo_id'],
-                "return_url" => $site_url . '/d/narocilo/paypal?narocilo_id='.$orderDetails['narocilo_id'],
+                "cancel_url" => $drupal_url_cancel,
+                "return_url" => $drupal_url_confirm,
 
                 'brand_name' => '1KA'
             ] 
diff --git a/function.php b/function.php
index 1f859269b..cb34a8e4e 100644
--- a/function.php
+++ b/function.php
@@ -413,7 +413,7 @@ function login()
         else {
             $r = mysqli_fetch_row($result);
 
-            if ($cookie_pass == base64_encode((hash(SHA256, base64_decode($r[0]) . $pass_salt)))) {
+            if ($cookie_pass == base64_encode((hash('SHA256', base64_decode($r[0]) . $pass_salt)))) {
 
                 $is_meta = 1;
                 $admin_type = "0";