diff --git a/console/src/app/modules/features/features.component.html b/console/src/app/modules/features/features.component.html
index 3fbca69eef..2c938e25eb 100644
--- a/console/src/app/modules/features/features.component.html
+++ b/console/src/app/modules/features/features.component.html
@@ -35,7 +35,7 @@
         <p class="error" *ngIf="(stripeCustomer || stripeCustomer == null) && !customerValid">{{'FEATURES.TIER.CUSTOMERINVALID' | translate}}</p>
 
         <div class="current-tier">
-            <a [disabled]="!org.id || !customerValid" mat-raised-button [href]="stripeURL" target="_blank"
+            <a [disabled]="!org.id || !customerValid || !stripeURL" mat-raised-button [href]="stripeURL" target="_blank"
                 alt="change tier">{{'FEATURES.TIER.BTN' | translate}}</a>
         </div>
     </ng-container>
@@ -152,8 +152,8 @@
         </div>
     </div>
 
-    <div class="btn-container">
-        <button (click)="savePolicy()" [disabled]="(['iam.features.write'] | hasRole | async) == false" color="primary"
+    <div class="btn-container" *ngIf="(['iam.features.write'] | hasRole | async) == true">
+        <button (click)="savePolicy()" color="primary"
             type="submit" mat-raised-button>{{ 'ACTIONS.SAVE' | translate
             }}</button>
     </div>
diff --git a/console/src/app/modules/features/features.component.ts b/console/src/app/modules/features/features.component.ts
index 7444f99a61..26074c468a 100644
--- a/console/src/app/modules/features/features.component.ts
+++ b/console/src/app/modules/features/features.component.ts
@@ -115,7 +115,6 @@ export class FeaturesComponent implements OnDestroy {
       this.subService.getLink(this.org.id, window.location.href)
         .then(payload => {
           this.stripeLoading = false;
-          console.log(payload);
           this.stripeURL = payload.redirect_url;
         })
         .catch(error => {
diff --git a/console/src/app/pipes/timestamp-to-retention-pipe/timestamp-to-retention.pipe.ts b/console/src/app/pipes/timestamp-to-retention-pipe/timestamp-to-retention.pipe.ts
index 668c219422..c962f56b5f 100644
--- a/console/src/app/pipes/timestamp-to-retention-pipe/timestamp-to-retention.pipe.ts
+++ b/console/src/app/pipes/timestamp-to-retention-pipe/timestamp-to-retention.pipe.ts
@@ -18,7 +18,7 @@ export class TimestampToRetentionPipe implements PipeTransform {
     if (date?.seconds !== undefined && date?.nanos !== undefined) {
       const ms = (date.seconds * 1000 + date.nanos / 1000 / 1000);
       const mins = ms / 1000 / 60;
-      return mins / 60 / 24;
+      return +(mins / 60 / 24).toFixed(2);
     }
   }
 }
diff --git a/internal/command/iam_features_model.go b/internal/command/iam_features_model.go
index 9b1042b441..2a043bc851 100644
--- a/internal/command/iam_features_model.go
+++ b/internal/command/iam_features_model.go
@@ -73,13 +73,13 @@ func (wm *IAMFeaturesWriteModel) NewSetEvent(
 	if tierName != "" && wm.TierName != tierName {
 		changes = append(changes, features.ChangeTierName(tierName))
 	}
-	if tierDescription != "" && wm.TierDescription != tierDescription {
+	if wm.TierDescription != tierDescription {
 		changes = append(changes, features.ChangeTierDescription(tierDescription))
 	}
 	if wm.State != state {
 		changes = append(changes, features.ChangeState(state))
 	}
-	if stateDescription != "" && wm.StateDescription != stateDescription {
+	if wm.StateDescription != stateDescription {
 		changes = append(changes, features.ChangeStateDescription(stateDescription))
 	}
 	if auditLogRetention != 0 && wm.AuditLogRetention != auditLogRetention {
diff --git a/internal/command/org_features_model.go b/internal/command/org_features_model.go
index 7855fa8695..fc40a496fb 100644
--- a/internal/command/org_features_model.go
+++ b/internal/command/org_features_model.go
@@ -80,7 +80,7 @@ func (wm *OrgFeaturesWriteModel) NewSetEvent(
 	if tierName != "" && wm.TierName != tierName {
 		changes = append(changes, features.ChangeTierName(tierName))
 	}
-	if tierDescription != "" && wm.TierDescription != tierDescription {
+	if wm.TierDescription != tierDescription {
 		changes = append(changes, features.ChangeTierDescription(tierDescription))
 	}
 	if wm.State != state {