diff --git a/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/components/user/detail/user.detail.component.html b/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/components/user/detail/user.detail.component.html
index d3225afa0..fb9a1b7c2 100644
--- a/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/components/user/detail/user.detail.component.html
+++ b/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/components/user/detail/user.detail.component.html
@@ -83,12 +83,18 @@ <h3 class="profile-username text-center">{{$ctrl.user.name.formatted}}</h3>
                 </td>
             </tr>
             <tr ng-if="$ctrl.aupIsEnabled()">
-                <td class="text-bold text-left">
+                <td class="text-bold text-left" ng-if="!$ctrl.user.aupSignatureExpiryDate">
                     Signed AUP
                 </td>
-                <td class="text-right" ng-if="$ctrl.hasAupSignatureTime()">
+                <td class="text-bold text-left" ng-if="$ctrl.user.aupSignatureExpiryDate">
+                    AUP expiration
+                </td>
+                <td class="text-right" ng-if="$ctrl.hasAupSignatureTime() && !$ctrl.user.aupSignatureExpiryDate">
                     {{$ctrl.user.aupSignature.signatureTime | relativeDate }}
                 </td>
+                <td class="text-right" ng-if="$ctrl.hasAupSignatureTime() && $ctrl.user.aupSignatureExpiryDate">
+                    {{$ctrl.user.aupSignatureExpiryDate | relativeDate }}
+                </td>
                 <td class="text-right" ng-if="!$ctrl.hasAupSignatureTime()">
                     No AUP signature found
                 </td>
diff --git a/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/services/user.service.js b/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/services/user.service.js
index d2ba9cfe6..223cf2f0b 100644
--- a/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/services/user.service.js
+++ b/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/services/user.service.js
@@ -44,6 +44,10 @@ function UserService($q, $rootScope, scimFactory, Authorities, Utils, AupService
                 var user = result[0];
                 if (result[1] !== null) {
                     user.aupSignature = result[1].data;
+                    if (user.aupSignature.aup.signatureValidityInDays != 0){
+                        user.aupSignatureExpiryDate = new Date(new Date(user.aupSignature.signatureTime).getTime() + 
+                                                        user.aupSignature.aup.signatureValidityInDays * 24 * 60 * 60 * 1000);
+                    }  
                 } else {
                     user.aupSignature = null;
                 }
@@ -63,6 +67,10 @@ function UserService($q, $rootScope, scimFactory, Authorities, Utils, AupService
                 user.authorities = result[1].data.authorities;
                 if (result[2] !== null) {
                     user.aupSignature = result[2].data;
+                    if (user.aupSignature.aup.signatureValidityInDays != 0){
+                        user.aupSignatureExpiryDate = new Date(new Date(user.aupSignature.signatureTime).getTime() + 
+                                                        user.aupSignature.aup.signatureValidityInDays * 24 * 60 * 60 * 1000);
+                    }
                 } else {
                     user.aupSignature = null;
                 }