diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index 16a1fdaba..ab4908e7c 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -1918,6 +1918,7 @@ class GDPR{
         // PODATKI O POOBLAŠČENI OSEBI ZA VARSTVO OSEBNIH PODATKOV
         $result[4]['heading'] = $lang['srv_gdpr_survey_gdpr_about_text5_1'];
         
+        // DPO
         if($gdpr_survey_settings['authorized'] == ''){
             
             // Zasebnik brez DPO
@@ -1941,18 +1942,42 @@ class GDPR{
                 }
                 // Ce ga ni vnesel, je DPO mail enak splosnemu mailu oz. mailu avtorja ankete
                 else{
-                    if($gdpr_settings['email'] != '')
+                    if($gdpr_settings['email'] != ''){
                         $gdpr_authorized = $gdpr_settings['email'];
-                    else
+                    }
+                    else{
                         $gdpr_authorized = User::getInstance()->primaryEmail();
+                    }
                 }
             }
         }
         else{
             $gdpr_authorized = $gdpr_survey_settings['authorized'];
         }
-        $result[4]['text'][0] = $lang['srv_gdpr_survey_gdpr_about_text5_2'].' <strong>'.$gdpr_authorized.'</strong>';
 
+        // Kontaktni email
+        if($gdpr_survey_settings['contact_email'] == ''){
+
+            $user_settings = self::getUserSettings();
+
+            // Kontaktni mail je enak mailu, ki ga je vnesel v splosnih nastavitvah
+            if($user_settings['email'] != ''){
+                $gdpr_contact_email = $user_settings['email'];
+            }
+            // Ce ga ni vnesel, je kontaktni mail enak mailu avtorja ankete
+            else{
+                $gdpr_contact_email = User::getInstance()->primaryEmail();
+            }
+        }
+        else{
+            $gdpr_contact_email = $gdpr_survey_settings['contact_email'];
+        }
+
+        $result[4]['text'][0] = $lang['srv_gdpr_survey_gdpr_about_text5_2'].' <strong>'.$gdpr_authorized.'</strong>';
+        
+        // Ce mail ni isti izpisemo se avtorja
+        if($gdpr_authorized != $gdpr_contact_email)
+            $result[4]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text5_2_2'].' <strong>'.$gdpr_contact_email.'</strong>';
 
         // ZAVAROVANJE PODATKOV
         $result[5]['heading'] = $lang['srv_gdpr_survey_gdpr_about_text6_1'];
diff --git a/lang/1.php b/lang/1.php
index b5de339fd..30e5b0f98 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -7783,7 +7783,8 @@ $lang = array (
 	'srv_gdpr_survey_gdpr_about_text4_22_5'	=> "(komu v tretjo državo se ti podatki posredujejo) na podlagi pravne podlage",
   
     'srv_gdpr_survey_gdpr_about_text5_1' 	=> "PODATKI O POOBLAŠČENI OSEBI ZA VARSTVO OSEBNIH PODATKOV",
-	'srv_gdpr_survey_gdpr_about_text5_2' 	=> "Avtor raziskave ima imenovano pooblaščeno osebo za varstvo osebnih podatkov, ki je dosegljiva na",
+	'srv_gdpr_survey_gdpr_about_text5_2' 	=> "Avtor raziskave oz. organizacija, v okviru katere poteka raziskava, ima imenovano pooblaščeno osebo za varstvo osebnih podatkov, ki je dosegljiva na",
+	'srv_gdpr_survey_gdpr_about_text5_2_2' 	=> "Avtor ankete je dosegljiv na elektronskem naslovu",
     
     'srv_gdpr_survey_gdpr_about_text6_1' 	=> "ZAVAROVANJE PODATKOV",
 	'srv_gdpr_survey_gdpr_about_text6_2' 	=> "Avtor raziskave bo pridobljene podatke ščitil pred nepooblaščenim dostopom, spreminjanjem, uporabo, zbiranjem, shranjevanjem, obdelavo, razkritjem ali uničenjem. Dostop do podatkov ima le avtor raziskave, vzdrževalec 1KA storitve ter njegov pogodbeni podizvajalec.",
diff --git a/lang/2.php b/lang/2.php
index 2fefbca33..f379cc61a 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -7683,7 +7683,8 @@ GDPR introduction preview",
 	'srv_gdpr_survey_gdpr_about_text4_22_5'	=> "(to whom this data is transmitted) based on the legal basis of",
   
     'srv_gdpr_survey_gdpr_about_text5_1' 	=> "DATA ON AUTHORIZED PERSONAL DATA PROTECTION",
-	'srv_gdpr_survey_gdpr_about_text5_2' 	=> "The author of the survey has an authorized personal data protection officer who can be reached at",
+    'srv_gdpr_survey_gdpr_about_text5_2' 	=> "The author of the research or the organization within which the research takes place has an authorized personal data protection officer who can be reached at",
+	'srv_gdpr_survey_gdpr_about_text5_2_2' 	=> "The author of the survey can be reached at",
     
     'srv_gdpr_survey_gdpr_about_text6_1' 	=> "DATA PROTECTION",
 	'srv_gdpr_survey_gdpr_about_text6_2' 	=> "The author of the survey will protect the information obtained from unauthorized access, modification, use, collection, storage, processing, disclosure or destruction. Only the author of the research, the maintainer of the 1KA service and its subcontractor have access to the data.",