diff --git a/knox-token-generation-ui/token-generation/app/token-generation.component.html b/knox-token-generation-ui/token-generation/app/token-generation.component.html
index d02989a5c..16e9afeb5 100644
--- a/knox-token-generation-ui/token-generation/app/token-generation.component.html
+++ b/knox-token-generation-ui/token-generation/app/token-generation.component.html
@@ -29,7 +29,7 @@ <h3>Token Generation</h3>
             <label *ngIf="comment.invalid" style="color: red;"><i class="icon-warning"></i>Invalid comment!</label>
 
             <label><i class="icon-info"></i> Configured maximum lifetime: </label>
-            <label>{{tssStatus.maximumLifetimeText}}</label>
+            <label>{{tssStatus.maximumLifetimeText}} <i class="icon-exclamation" *ngIf="'Unlimited lifetime' === tssStatus.maximumLifetimeText"></i></label>
             <div *ngIf="tssStatus.lifespanInputEnabled">
                 <label><i class="icon-time"></i> Lifetime (days, hours, mins):</label>
                 <table>
diff --git a/knox-token-generation-ui/token-generation/app/token-generation.service.ts b/knox-token-generation-ui/token-generation/app/token-generation.service.ts
index 19c651b18..4c74cab68 100644
--- a/knox-token-generation-ui/token-generation/app/token-generation.service.ts
+++ b/knox-token-generation-ui/token-generation/app/token-generation.service.ts
@@ -53,7 +53,8 @@ export class TokenGenService {
                 return {
                     tokenManagementEnabled: responseData.tokenManagementEnabled === 'true',
                     maximumLifetimeText: responseData.maximumLifetimeText,
-                    maximumLifetimeSeconds: responseData.maximumLifetimeSeconds,
+                    // the '+' character at the beginning converts the incoming string to a number
+                    maximumLifetimeSeconds: +responseData.maximumLifetimeSeconds,
                     lifespanInputEnabled: responseData.lifespanInputEnabled === 'true',
                     impersonationEnabled: responseData.impersonationEnabled === 'true',
                     configuredTssBackend: responseData.configuredTssBackend,