diff --git a/package-lock.json b/package-lock.json
index 6ec21450..510fa946 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8288,6 +8288,11 @@
         "verror": "1.10.0"
       }
     },
+    "jssha": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jssha/-/jssha-3.2.0.tgz",
+      "integrity": "sha512-QuruyBENDWdN4tZwJbQq7/eAK85FqrI4oDbXjy5IBhYD+2pTJyBUWZe8ctWaCkrV0gy6AaelgOZZBMeswEa/6Q=="
+    },
     "jszip": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
@@ -10075,6 +10080,14 @@
         "os-tmpdir": "^1.0.0"
       }
     },
+    "otpauth": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/otpauth/-/otpauth-7.0.6.tgz",
+      "integrity": "sha512-XYVJbeCqrbjrLLbpWoydzAc9uvb5BRuu3fi3JqOs8RWs6v+oNxb0nC903Iuo9b3oKOtfLCwopdn08Wwk8BY1JA==",
+      "requires": {
+        "jssha": "~3.2.0"
+      }
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
diff --git a/package.json b/package.json
index ec7af640..aaacf013 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "material-design-lite": "1.3.0",
     "ngx-clipboard": "13.0.1",
     "nouislider": "14.6.0",
+    "otpauth": "^7.0.6",
     "popper.js": "^1.16.1",
     "rxjs": "^6.6.2",
     "tslib": "^2.0.1",
diff --git a/src/app/app.page/app.page.component.html b/src/app/app.page/app.page.component.html
index 308e9104..d48993f3 100644
--- a/src/app/app.page/app.page.component.html
+++ b/src/app/app.page/app.page.component.html
@@ -1680,7 +1680,7 @@ <h4 class="card-title text-left" i18n="@@newLiveStreamCardTitle">
                                                             <div class="checkbox">
                                                                 <input [(ngModel)]="appSettings.enableTimeTokenForPublish"
                                                                     id="enableTimeTokenForPublish" name="enableTimeTokenForPublish"
-                                                                    type="checkbox">
+                                                                    type="checkbox" (click)="generateTOTPToken()">
 
                                                                 <label for="enableTimeTokenForPublish">
                                                                     Enable TOTP for Publishing <a
@@ -1697,7 +1697,7 @@ <h4 class="card-title text-left" i18n="@@newLiveStreamCardTitle">
                                                             <div class="checkbox">
                                                                 <input [(ngModel)]="appSettings.enableTimeTokenForPlay"
                                                                     id="enableTimeTokenForPlay" name="enableTimeTokenForPlay"
-                                                                    type="checkbox">
+                                                                    type="checkbox" (click)="generateTOTPToken()">
 
                                                                 <label for="enableTimeTokenForPlay">
                                                                     Enable TOTP for Playing <a
@@ -1811,6 +1811,326 @@ <h4 class="card-title text-left" i18n="@@newLiveStreamCardTitle">
                                                             </div>
                                                         </div>
 
+                                                        <div *ngIf="appSettings.publishJwtControlEnabled && isEnterpriseEdition" class="col-xs-12" style="margin-top:12px">
+                                                            <label i18n="@@jwtFilter">
+                                                                Generate JWT token for publishing<a
+                                                                    matTooltip="Please configure jwt stream secret before trying to create a token, each token has an expiry time of 100 seconds"><i
+                                                                    class="fa fa-info-circle"></i></a>
+                                                            </label>
+                                                            <div class="form-group">
+                                                            
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                        class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                        style="min-width: 190px; ">Stream ID</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6 text-left">
+                                                                        <input type="text" name="jwtPublishId"
+                                                                            placeholder="Write stream ID for generating token"
+                                                                            class="form-control"
+                                                                            [(ngModel)]="jwtPublishStreamId"
+                                                                            #vodFolderPath="ngModel">
+                                                                        <small
+                                                                            [hidden]="jwtPublishStreamIdCheck"
+                                                                            class="text-danger">
+                                                                            StreamID should be given
+                                                                        </small>
+                                                                    </div>
+                                                                </div>
+                                                                
+
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                            class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                            style="min-width: 190px; ">JWT Token</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6">
+                                                                        
+                                                                        <textarea name="jwtPublishTok" #jwtPublish="ngModel" [disabled]="!appSettings.publishJwtControlEnabled && !appSettings.playJwtControlEnabled"
+                                                                            [(ngModel)]="jwtPublishToken"
+                                                                            type="textarea" class="form-control"
+                                                                            placeholder="Token will be displayed here"
+                                                                            rows="1">{{jwtPublishToken}}
+                                                                        </textarea>
+                                                                        <button
+                                                                            (click)="getJwtStreamToken('publish')" class="btn pull-right btn-default" style="margin:5px"
+                                                                            type="button">
+                                                                                Generate
+                                                                        </button>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+
+                                                        <div *ngIf="appSettings.playJwtControlEnabled && isEnterpriseEdition" class="col-xs-12" style="margin-top:12px">
+                                                            <label i18n="@@jwtFilter">
+                                                                Generate JWT token for playing<a
+                                                                    matTooltip="Please configure jwt stream secret before trying to create a token, each token has an expiry time of 100 seconds"><i
+                                                                    class="fa fa-info-circle"></i></a>
+                                                            </label>
+                                                            <div class="form-group">
+                                                            
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                        class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                        style="min-width: 190px; ">Stream ID</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6 text-left">
+                                                                        <input type="text" name="jwtPlayId"
+                                                                            placeholder="Write stream ID for generating token"
+                                                                            class="form-control"
+                                                                            [(ngModel)]="jwtPlayStreamId"
+                                                                            #vodFolderPath="ngModel">
+                                                                        <small
+                                                                            [hidden]="jwtPlayStreamIdCheck"
+                                                                            class="text-danger">
+                                                                            StreamID should be given
+                                                                        </small>
+                                                                    </div>
+                                                                </div>
+
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                            class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                            style="min-width: 190px; ">JWT Token</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6">
+                                                                        
+                                                                        <textarea name="jwtPlayTok" #jwtPlay="ngModel" [disabled]="!appSettings.publishJwtControlEnabled && !appSettings.playJwtControlEnabled"
+                                                                            [(ngModel)]="jwtPlayToken"
+                                                                            type="textarea" class="form-control"
+                                                                            placeholder="Token will be displayed here"
+                                                                            rows="1">{{jwtPlayToken}}
+                                                                        </textarea>
+                                                                        <button
+                                                                            (click)="getJwtStreamToken('play')" class="btn pull-right btn-default" style="margin:5px"
+                                                                            type="button">
+                                                                                Generate
+                                                                        </button>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <div *ngIf="appSettings.publishTokenControlEnabled && isEnterpriseEdition" class="col-xs-12" style="margin-top:12px">
+                                                            <label i18n="@@jwtFilter">
+                                                                Generate One-Time token for publishing<a
+                                                                    matTooltip="Each token has an expiry time of 100 seconds"><i
+                                                                    class="fa fa-info-circle"></i></a>
+                                                            </label>
+                                                            <div class="form-group">
+                                                            
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                        class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                        style="min-width: 190px; ">Stream ID</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6 text-left">
+                                                                        <input type="text" name="oneTimePublishId"
+                                                                            placeholder="Write stream ID for generating token"
+                                                                            class="form-control"
+                                                                            [(ngModel)]="oneTimeTokenPublishStreamId"
+                                                                            #vodFolderPath="ngModel">
+                                                                        <small
+                                                                            [hidden]="oneTimeTokenPublishStreamIdCheck"
+                                                                            class="text-danger">
+                                                                            StreamID should be given
+                                                                        </small>
+                                                                    </div>
+                                                                </div>
+
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                            class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                            style="min-width: 190px; ">One Time Token</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6">
+                                                                        
+                                                                        <textarea name="oneTimePublishTok" #jwtPublish="ngModel" [disabled]="!appSettings.publishTokenControlEnabled && !appSettings.playTokenControlEnabled"
+                                                                            [(ngModel)]="oneTimePublishToken"
+                                                                            type="textarea" class="form-control"
+                                                                            placeholder="Token will be displayed here"
+                                                                            rows="1">{{oneTimePublishToken}}
+                                                                        </textarea>
+                                                                        <button
+                                                                            (click)="getStreamToken('publish')" class="btn pull-right btn-default" style="margin:5px"
+                                                                            type="button">
+                                                                                Generate
+                                                                        </button>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <div *ngIf="appSettings.playTokenControlEnabled && isEnterpriseEdition" class="col-xs-12" style="margin-top:12px">
+                                                            <label i18n="@@jwtFilter">
+                                                                Generate One-Time token for playing<a
+                                                                    matTooltip="Each token has an expiry time of 100 seconds"><i
+                                                                    class="fa fa-info-circle"></i></a>
+                                                            </label>
+                                                            <div class="form-group">
+                                                            
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                        class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                        style="min-width: 190px; ">Stream ID</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6 text-left">
+                                                                        <input type="text" name="oneTimePlayId"
+                                                                            placeholder="Write stream ID for generating token"
+                                                                            class="form-control"
+                                                                            [(ngModel)]="oneTimeTokenPlayStreamId"
+                                                                            #vodFolderPath="ngModel">
+                                                                        <small
+                                                                            [hidden]="oneTimeTokenPlayStreamIdCheck"
+                                                                            class="text-danger">
+                                                                            StreamID should be given
+                                                                        </small>
+                                                                    </div>
+                                                                </div>
+
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                            class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                            style="min-width: 190px; ">One Time Token</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6">
+                                                                        
+                                                                        <textarea name="oneTimePlayTok" #jwtPublish="ngModel" [disabled]="!appSettings.publishTokenControlEnabled && !appSettings.playTokenControlEnabled"
+                                                                            [(ngModel)]="oneTimePlayToken"
+                                                                            type="textarea" class="form-control"
+                                                                            placeholder="Token will be displayed here"
+                                                                            rows="1">{{oneTimePlayToken}}
+                                                                        </textarea>
+                                                                        <button
+                                                                            (click)="getStreamToken('play')" class="btn pull-right btn-default" style="margin:5px"
+                                                                            type="button">
+                                                                                Generate
+                                                                        </button>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        
+                                                        <div *ngIf="(appSettings.enableTimeTokenForPlay || appSettings.enableTimeTokenForPublish) && isEnterpriseEdition" class="col-xs-12" style="margin-top:12px">
+                                                            <label i18n="@@jwtFilter">
+                                                                Generate TOTP token<a
+                                                                    matTooltip="Each token has an expiry time of 100 seconds"><i
+                                                                    class="fa fa-info-circle"></i></a>
+                                                            </label>
+                                                            <div class="form-group">
+                                                            
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                        class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                        style="min-width: 190px; ">Secret</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6 text-left">
+                                                                        <input type="text" name="TOTPSecretInput"
+                                                                            placeholder="Write secret for subscriber"
+                                                                            class="form-control"
+                                                                            [(ngModel)]="TOTPSecret"
+                                                                            #totpSecret="ngModel" required type="text">
+                                                                        <small [hidden]="totpSecret.valid"
+                                                                            class="text-danger">
+                                                                            Secret is required
+                                                                        </small>
+                                                                    </div>
+                                                                </div>
+
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                        class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                        style="min-width: 190px; ">Number of Digits</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6 text-left">
+                                                                        <input type="text" name="TOTPPlayId"
+                                                                            placeholder="Write secret for subscriber"
+                                                                            class="form-control"
+                                                                            [(ngModel)]="TOTPNoOfDigits"
+                                                                            #totpNumberOfDigits="ngModel" required
+                                                                            type="number">
+                                                                        <small [hidden]="totpNumberOfDigits.valid"
+                                                                            class="text-danger">
+                                                                            Digit number is required
+                                                                        </small>
+                                                                    </div>
+                                                                </div>
+
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                        class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                        style="min-width: 190px; ">Token Period (s)</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6 text-left">
+                                                                        <input type="text" name="TOTPPeriod"
+                                                                            placeholder="Write secret for subscriber"
+                                                                            class="form-control"
+                                                                            [(ngModel)]="TOTPPeriod"
+                                                                            #totpPeriod="ngModel" required
+                                                                            type="number">
+                                                                        <small [hidden]="totpPeriod.valid"
+                                                                            class="text-danger">
+                                                                            Period is required
+                                                                        </small>
+                                                                    </div>
+                                                                </div>
+
+                                                                <div class="form-group" style="margin-left: 5px;">
+
+                                                                    <label
+                                                                            class="col-sm-12 col-md-3 col-lg-3 control-label"
+                                                                            style="min-width: 190px; ">TOTP Token</label>
+
+
+                                                                    <div class="col-sm-12 col-md-9 col-lg-6">
+                                                                        
+                                                                        <textarea name="totptoken" #totpTok="ngModel" [disabled]="!appSettings.publishTokenControlEnabled && !appSettings.playTokenControlEnabled"
+                                                                            [(ngModel)]="TOTPToken"
+                                                                            type="textarea" class="form-control"
+                                                                            placeholder="Token will be displayed here"
+                                                                            rows="1">{{TOTPToken}}
+                                                                        </textarea>
+
+                                                                        <div class="form-group" style="margin-left: 5px;">
+                                                                            <div class="col-sm-12 col-md-9 col-lg-6 text-left">
+                                                                                <p>{{timeLeftForTOTP}} Seconds Left....</p>
+                                                                            </div>
+                                                                        </div>
+                                                                        <button
+                                                                            (click)="generateTOTPToken()" class="btn pull-right btn-default" style="margin:5px"
+                                                                            type="button">
+                                                                                Generate
+                                                                        </button>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+
                                                     </div>
                                                 </div>
 
@@ -1875,7 +2195,7 @@ <h4 class="card-title text-left" i18n="@@newLiveStreamCardTitle">
                                                                     matTooltip="Please enter at least 32 character"><i
                                                                     class="fa fa-info-circle"></i></a>
                                                             </label>
-
+                                                            
                                                             <div>
                                                                 <textarea name="jwtSecret" minlength="32"  #jwtSecret="ngModel" [disabled]="!appSettings.jwtControlEnabled"
                                                                           [(ngModel)]="appSettings.jwtSecretKey"
diff --git a/src/app/app.page/app.page.component.ts b/src/app/app.page/app.page.component.ts
index 265220ee..6433edb0 100644
--- a/src/app/app.page/app.page.component.ts
+++ b/src/app/app.page/app.page.component.ts
@@ -23,6 +23,7 @@ import {MatTableDataSource} from "@angular/material/table"
 import {MatSort} from "@angular/material/sort"
 import "rxjs/add/operator/toPromise";
 import {AppSettings, ServerSettings} from "./app.definitions";
+import * as OTPAuth from 'otpauth';
 
 import {
     BroadcastInfo,
@@ -188,6 +189,27 @@ export class AppPageComponent implements OnInit, OnDestroy, AfterViewInit {
     public user: User;
     public currentClusterNode: string;
 
+    public jwtPublishToken: String;
+    public jwtPlayToken: String;
+    public jwtPublishStreamId: string;
+    public jwtPlayStreamId: String;
+    public jwtPublishStreamIdCheck = true;
+    public jwtPlayStreamIdCheck = true;
+    public oneTimeTokenPublishStreamIdCheck = true;
+    public oneTimeTokenPlayStreamIdCheck = true;
+    public TOTPSecret = "mysecret";
+    public TOTPNoOfDigits = 6;
+    public TOTPPeriod = 60;
+    public TOTPToken : string;
+    public TOTPGeneratorTimer = null;
+    public timeLeftForTOTP = 0;
+
+    public oneTimeTokenPublishStreamId: string;
+    public oneTimePublishToken: string;
+    public oneTimePlayToken: string;
+    public oneTimeTokenPlayStreamId: string;
+
+
 
     public appSettings: AppSettings; // = new AppSettings(false, true, true, 5, 2, "event", "no clientid", "no fb secret", "no youtube cid", "no youtube secre", "no pers cid", "no pers sec");
     public token: Token;
@@ -767,6 +789,12 @@ export class AppPageComponent implements OnInit, OnDestroy, AfterViewInit {
         this.timerId = null ;
         this.dropdownTimer = null ;
 
+        if(this.TOTPGeneratorTimer != null || typeof this.TOTPGeneratorTimer != "undefined"){
+            clearInterval(this.TOTPGeneratorTimer);
+
+            this.TOTPGeneratorTimer = null;
+        }
+
     }
 
     ngOnDestroy() {
@@ -952,7 +980,8 @@ export class AppPageComponent implements OnInit, OnDestroy, AfterViewInit {
         let currentUnixTime : number = Math.floor(Date.now() / 1000)
         let expireDate : number = currentUnixTime + 100;
 
-        this.restService.getOneTimeToken (this.appName, tokenParam, expireDate).subscribe(data => {
+
+        this.restService.getOneTimeToken (this.appName, tokenParam, expireDate, "play").subscribe(data => {
             this.token = <Token>data;
             this.openPlayer(this.getIFrameEmbedCode(id), id, path, "640px", this.token.tokenId)
         });
@@ -962,7 +991,7 @@ export class AppPageComponent implements OnInit, OnDestroy, AfterViewInit {
         let currentUnixTime : number = Math.floor(Date.now() / 1000)
         let expireDate : number = currentUnixTime + 100;
 
-        this.restService.getJWTToken(this.appName, tokenParam, expireDate).subscribe(data => {
+        this.restService.getJwtToken(this.appName, tokenParam, expireDate, "play").subscribe(data => {
             this.token = <Token>data;
             this.openPlayer(this.getIFrameEmbedCode(id), id, path, "640px", this.token.tokenId)
         });
@@ -1830,6 +1859,135 @@ export class AppPageComponent implements OnInit, OnDestroy, AfterViewInit {
         return str;
     };
 
+    generateTOTPToken(){
+        if((this.TOTPGeneratorTimer == null || typeof this.TOTPGeneratorTimer == "undefined")){     
+            this.TOTPGeneratorTimer = setInterval(() => {
+                // Create a new TOTP object.
+                let totp = new OTPAuth.TOTP({
+                    algorithm: 'SHA1',
+                    digits: this.TOTPNoOfDigits,
+                    period: this.TOTPPeriod,
+                    secret: OTPAuth.Secret.fromBase32(this.TOTPSecret) 
+                });
+                // Generate a token.
+                this.TOTPToken = totp.generate();
+                let currentTime = Math.round(new Date().getTime() / 1000.0);
+                this.timeLeftForTOTP = this.TOTPPeriod - (currentTime % this.TOTPPeriod);
+                if(!this.appSettings.enableTimeTokenForPublish && !this.appSettings.enableTimeTokenForPlay){
+                    clearInterval(this.TOTPGeneratorTimer);
+                    this.TOTPGeneratorTimer = null;
+                }
+            },1000)
+        } 
+    }
+
+    //Get JWT token from the REST call to the server
+    getJwtStreamToken(type: string){
+        let currentUnixTime : number = Math.floor(Date.now() / 1000)
+        let expireDate : number = currentUnixTime + 100;
+
+        if(type == "publish"){
+            this.jwtPublishStreamIdCheck=true;
+            if(typeof this.jwtPublishStreamId == "undefined" || this.jwtPublishStreamId == null || this.jwtPublishStreamId == ""){
+                this.jwtPublishStreamIdCheck = false;
+                this.showTokenNotGenerated();
+            }
+            else{
+                this.restService.getJwtToken (this.appName, this.jwtPublishStreamId, expireDate, type).subscribe(data => {
+                    this.token = <Token>data;
+                    if(data["success"] == true){
+                        this.jwtPublishToken = this.token.tokenId;
+                    }
+                    else{
+                        this.showTokenNotGenerated();
+                    }
+                },
+                error =>{
+                    this.showTokenNotGenerated();
+                });
+            }
+        }
+        if(type == "play"){
+            this.jwtPlayStreamIdCheck=true;
+            if(typeof this.jwtPlayStreamId == "undefined" || this.jwtPlayStreamId == null || this.jwtPlayStreamId == ""){
+                this.jwtPlayStreamIdCheck = false;
+                this.showTokenNotGenerated();
+            }
+            else{
+                this.restService.getJwtToken (this.appName, this.jwtPublishStreamId, expireDate, type).subscribe(data => {
+                    this.token = <Token>data;
+                    if(data["success"] == true){
+                        this.jwtPlayToken = this.token.tokenId;
+                    }
+                    else{
+                        this.showTokenNotGenerated();
+                    }
+                },
+                error =>{
+                    this.showTokenNotGenerated();
+                });
+            }
+        }
+    }
+    getStreamToken(type: string){
+        let currentUnixTime : number = Math.floor(Date.now() / 1000)
+        let expireDate : number = currentUnixTime + 100;
+        
+        if(type == "publish"){
+            this.oneTimeTokenPublishStreamIdCheck=true;
+            if(typeof this.oneTimeTokenPublishStreamId == "undefined" || this.oneTimeTokenPublishStreamId == null || this.oneTimeTokenPublishStreamId == ""){
+                this.oneTimeTokenPublishStreamIdCheck = false;
+                this.showTokenNotGenerated();
+            }
+            else{
+                this.restService.getOneTimeToken(this.appName, this.oneTimeTokenPublishStreamId, expireDate, type).subscribe(data => {
+                    this.token = <Token>data;
+                    if(data["tokenId"].length > 5){
+                        this.oneTimePublishToken = this.token.tokenId;
+                    }
+                    else{
+                        this.showTokenNotGenerated();
+                    }
+
+                });
+            }
+        }
+        if(type == "play"){
+            this.oneTimeTokenPlayStreamIdCheck = true;
+            if(typeof this.oneTimeTokenPlayStreamId == "undefined" || this.oneTimeTokenPlayStreamId == null || this.oneTimeTokenPlayStreamId == ""){
+                this.oneTimeTokenPlayStreamIdCheck = false;
+                this.showTokenNotGenerated();
+            }
+            else{
+                this.restService.getOneTimeToken (this.appName, this.oneTimeTokenPlayStreamId, expireDate, type).subscribe(data => {
+                    this.token = <Token>data;
+                    if(data["tokenId"].length > 5){
+                        this.oneTimePlayToken = this.token.tokenId;
+                    }
+                    else{
+                        this.showTokenNotGenerated();
+                    }
+                },
+                error =>{
+                    this.showTokenNotGenerated();
+                });
+            }
+        }
+    }
+    showTokenNotGenerated() {
+        $.notify({
+            icon: "ti-save",
+            message: Locale.getLocaleInterface().token_not_generated
+        }, {
+            type: "warning",
+            delay: 900,
+            placement: {
+                from: 'top',
+                align: 'right'
+            }
+        });
+    }
+
     startDiscover() {
         this.discoveryStarted = true;
         this.onvifURLs = this.getDiscoveryList();
diff --git a/src/app/locale/locale.en.ts b/src/app/locale/locale.en.ts
index 40828b1a..b1771319 100644
--- a/src/app/locale/locale.en.ts
+++ b/src/app/locale/locale.en.ts
@@ -42,4 +42,5 @@ export let Locale_English: LocaleInterface =
     missing_configuration_parameter_for_stalker: "Configuration params are missing. Please contact system admin",
     vod_deleted: "Vod file deleted successfully",
     support: "Support",
+    token_not_generated: "Token can't be generated, please check secret and streamId"
 }
diff --git a/src/app/locale/locale.interface.ts b/src/app/locale/locale.interface.ts
index a31d1033..2743c092 100644
--- a/src/app/locale/locale.interface.ts
+++ b/src/app/locale/locale.interface.ts
@@ -40,4 +40,5 @@ export interface LocaleInterface {
     missing_configuration_parameter_for_stalker: string;
     vod_deleted: string;
     support: string;
+    token_not_generated: string;
 }
\ No newline at end of file
diff --git a/src/app/locale/locale.tr.ts b/src/app/locale/locale.tr.ts
index 42ebeb64..75ceaa4e 100644
--- a/src/app/locale/locale.tr.ts
+++ b/src/app/locale/locale.tr.ts
@@ -43,5 +43,6 @@ export let Locale_Turkish: LocaleInterface =
     vod_deleted: "Vod başarıyla silindi.",
     cluster: "Cluster",
     support: "Destek",
+    token_not_generated: "Token oluşturulamadı, lütfen secret ve streamId yi kontrol edin."
 }
 
diff --git a/src/app/rest/rest.service.ts b/src/app/rest/rest.service.ts
index 59570723..cbe3123d 100644
--- a/src/app/rest/rest.service.ts
+++ b/src/app/rest/rest.service.ts
@@ -474,17 +474,17 @@ export class RestService {
     /**
      * This methods get One Time Token
      */
-    public getOneTimeToken(appName: string, streamId: string, expireDate:number) : Observable<Object>{
-       return this.http.get(REST_SERVICE_ROOT + "/request?_path=" + appName
-            + "/rest/v2/broadcasts/"+ streamId + "/token&expireDate="  + expireDate + "&type=play" );
+    public getOneTimeToken(appName: string, streamId: string, expireDate:number, type: string) : Observable<Object>{
+        return this.http.get(REST_SERVICE_ROOT + "/request?_path=" + appName
+            + "/rest/v2/broadcasts/"+ streamId + "/token&expireDate="  + expireDate + "&type=" + type );
     }
 
     /**
      * This methods get JWT Token
      */
-    public getJWTToken(appName: string, streamId: string, expireDate:number) : Observable<Object>{
+    public getJwtToken(appName: string, streamId: string, expireDate:number, type: string) : Observable<Object>{
         return this.http.get(REST_SERVICE_ROOT + "/request?_path=" + appName
-            + "/rest/v2/broadcasts/"+ streamId + "/jwt-token&expireDate="  + expireDate + "&type=play" );
+            + "/rest/v2/broadcasts/"+ streamId + "/jwt-token&expireDate="  + expireDate + "&type=" + type );
     }
 
     public getRtmpUrl(appName:string, streamId:string): string {