4 files changed, 15 insertions, 8 deletions
diff --git a/basicConfig/ms-connector/properties/messages.properties b/basicConfig/ms-connector/properties/messages.properties
index bac206f0..925aa9df 100644
--- a/basicConfig/ms-connector/properties/messages.properties
+++ b/basicConfig/ms-connector/properties/messages.properties
@@ -8,6 +8,7 @@ gui.errorpage.msg.title=Authentication error
 gui.errorpage.msg.information=The authentication stops on account of a process error:
 gui.errorpage.msg.errorcode=Error    Code:
 gui.errorpage.msg.errormsg=Error Message:
+gui.errorpage.msg.transactionId=TransactionId:
 gui.errorpage.msg.stacktrace=Stacktrace:
 
 ##Country-Selection page
diff --git a/basicConfig/ms-connector/properties/messages_de.properties b/basicConfig/ms-connector/properties/messages_de.properties
index 1686e388..03a16e2d 100644
--- a/basicConfig/ms-connector/properties/messages_de.properties
+++ b/basicConfig/ms-connector/properties/messages_de.properties
@@ -8,6 +8,7 @@ gui.errorpage.msg.title=Es ist ein Fehler aufgetreten
 gui.errorpage.msg.information=Der Anmeldevorgang wurde aufgrund eines Fehlers beendet:
 gui.errorpage.msg.errorcode=Fehlercode:
 gui.errorpage.msg.errormsg=Fehlermeldung:
+gui.errorpage.msg.transactionId=Transactionsnummer:
 gui.errorpage.msg.stacktrace=Stacktrace:
 
 ##Country-Selection page
diff --git a/basicConfig/ms-connector/templates/error_message.html b/basicConfig/ms-connector/templates/error_message.html
index 0d8d2d4e..4389a4ef 100644
--- a/basicConfig/ms-connector/templates/error_message.html
+++ b/basicConfig/ms-connector/templates/error_message.html
@@ -3,10 +3,10 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
-      
+
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
   <link rel="stylesheet" href="/static/common.css"/>
-  
+
   <title th:text="#{gui.errorpage.msg.title}">An error arise ...  </title>
 </head>
 
@@ -31,7 +31,7 @@
     <div id="page1" class="case selected-case" role="main">
       <div class="hell" role="application" >
         <h2 class="OA_header" role="heading" th:text="#{gui.errorpage.msg.title}">Error Header</h2>
-            
+
         <div id="alert_area" class="hell" role="application" >
           <p th:text="#{gui.errorpage.msg.information}">Error Information</p>
           <br/>
@@ -41,12 +41,17 @@
           <!-- grouped external errorCodes -->
           <p><b th:text="#{gui.errorpage.msg.errorcode}">Code:</b> <span th:text="${extErrorCode}"></span></p>
 
-          <p><b th:text="#{gui.errorpage.msg.errormsg}">Msg:</b> <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p> 
-        </div>      
-     </div>    
+          <p th:if="${T(at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils).getTransactionId() != null}">
+            <b th:text="#{gui.errorpage.msg.transactionId}"> TransactionsId:</b> <span th:text="${T(at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils).getTransactionId()}"></span>
+          </p>
+
+          <p><b th:text="#{gui.errorpage.msg.errormsg}">Msg:</b> <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p>
+
+        </div>
+     </div>
 
      <div th:if="${stacktrace}">
-       <p><b th:text="#{gui.errorpage.msg.stacktrace}">fullError</b> <span th:text="${stacktrace}"></span></p> 
+       <p><b th:text="#{gui.errorpage.msg.stacktrace}">fullError</b> <span th:text="${stacktrace}"></span></p>
      </div>
 
     </div>
diff --git a/basicConfig/ms-connector/templates/other_login_method.html b/basicConfig/ms-connector/templates/other_login_method.html
index 30bae604..478d6da5 100644
--- a/basicConfig/ms-connector/templates/other_login_method.html
+++ b/basicConfig/ms-connector/templates/other_login_method.html
@@ -58,7 +58,7 @@
         <p th:text="#{gui.otherlogin.inserternp.second}"> Insert ERnP second block </p>
         <p>
           <span th:text="#{gui.otherlogin.inserternp.third.prefix}"> Insert ERnP third block / part 1 </span>
-          <span>&nbsp;<a href="mailto:BMI-IKT-eIDAS-Betrieb@bmi.gv.at"> BMI-IKT-eIDAS-Betrieb@bmi.gv.at </a></span>
+          <span>&nbsp;<a href="mailto:helpdesk@bmi.gv.at"> helpdesk@bmi.gv.at </a></span>
           <span th:text="#{gui.otherlogin.inserternp.third.postfix}"> Insert ERnP third block / part 3 </span>
         </p>
       </div>