diff --git a/app/views/console/settings/index.phtml b/app/views/console/settings/index.phtml
index e6def1b2ee..34ac7bcca8 100644
--- a/app/views/console/settings/index.phtml
+++ b/app/views/console/settings/index.phtml
@@ -430,10 +430,10 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                                         data-scope="console"
                                         data-event="teams.deleteMembership.resend"
                                         data-success="alert,trigger"
-                                        data-success-param-alert-text="Invitation Sent Successfully"
+                                        data-success-param-alert-text="Invitation sent successfully"
                                         data-success-param-trigger-events="teams.createMembership.resent"
                                         data-failure="alert"
-                                        data-failure-param-alert-text="Failed to Send inivitation"
+                                        data-failure-param-alert-text="Failed to send inivitation"
                                         data-failure-param-alert-classname="error">
 
                                         <input name="teamId" type="hidden" data-ls-bind="{{member.teamId}}">
@@ -468,10 +468,10 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                             data-event="submit"
                             data-loading="Sending invitation, please wait..."
                             data-success="alert,trigger,reset"
-                            data-success-param-alert-text="Invitation Sent Successfully"
+                            data-success-param-alert-text="Invitation sent successfully"
                             data-success-param-trigger-events="teams.createMembership"
                             data-failure="alert"
-                            data-failure-param-alert-text="Failed to Send Invite"
+                            data-failure-param-alert-text="Failed to send invite"
                             data-failure-param-alert-classname="error">
 
                             <input name="teamId" id="team-teamId" type="hidden" data-ls-bind="{{console-project.teamId}}">
diff --git a/app/views/console/users/team.phtml b/app/views/console/users/team.phtml
index 15c1b658ed..c10fdad433 100644
--- a/app/views/console/users/team.phtml
+++ b/app/views/console/users/team.phtml
@@ -33,10 +33,6 @@
             <li data-state="/console/users/user?id={{router.params.id}}&project={{router.params.project}}">
                 <h2>General</h2>
 
-                <div data-ls-if="{{team.status}} === <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none" class="box padding-small danger margin-bottom-xxl text-align-center">
-                    This user account is blocked.
-                </div>
-
                 <div class="row responsive margin-top-xl">
                     <div class="col span-8">
                         <label>&nbsp;</label>
@@ -72,24 +68,22 @@
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
                         </ul>
 
-                        <div data-ls-if="{{team.status}} !== <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
-                            <form name="users.updateStatus" class="margin-bottom"
-                                data-analytics-event="submit"
-                                data-analytics-category="console"
-                                data-analytics-label="Update User Status"
-                                data-service="users.updateStatus"
-                                data-event="submit"
-                                data-param-user-id="{{router.params.id}}"
-                                data-success="alert,trigger"
-                                data-success-param-alert-text="Blocked User Successfully"
-                                data-success-param-trigger-events="users.update"
-                                data-failure="alert"
-                                data-failure-param-alert-text="Failed to Block User"
-                                data-failure-param-alert-classname="error">
+                        <form name="teams.delete" class="margin-bottom"
+                            data-analytics-event="submit"
+                            data-analytics-category="console"
+                            data-analytics-label="Update User Status"
+                            data-service="users.updateStatus"
+                            data-event="submit"
+                            data-param-team-id="{{router.params.id}}"
+                            data-success="alert,trigger"
+                            data-success-param-alert-text="Team deleted successfully"
+                            data-success-param-trigger-events="users.update"
+                            data-failure="alert"
+                            data-failure-param-alert-text="Failed to delete team"
+                            data-failure-param-alert-classname="error">
 
-                                <button name="status" type="submit" class="danger fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>">Block Account</button>
-                            </form>
-                        </div>
+                            <button type="submit" class="danger fill">Delete Team</button>
+                        </form>
 
                         <div data-ls-if="{{team.status}} === <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
                             <form name="users.updateStatus" class="margin-bottom"
@@ -100,10 +94,10 @@
                                 data-event="submit"
                                 data-param-user-id="{{router.params.id}}"
                                 data-success="alert,trigger"
-                                data-success-param-alert-text="Activated User Successfully"
+                                data-success-param-alert-text="Activated user successfully"
                                 data-success-param-trigger-events="users.update"
                                 data-failure="alert"
-                                data-failure-param-alert-text="Failed to Activate User"
+                                data-failure-param-alert-text="Failed to activate user"
                                 data-failure-param-alert-classname="error">
 
                                 <button name="status" type="submit" class="fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_ACTIVATED; ?>">Activate Account</button>
diff --git a/app/views/console/users/user.phtml b/app/views/console/users/user.phtml
index 18ca821343..d256c4e2b4 100644
--- a/app/views/console/users/user.phtml
+++ b/app/views/console/users/user.phtml
@@ -113,10 +113,10 @@
                                 data-event="submit"
                                 data-param-user-id="{{router.params.id}}"
                                 data-success="alert,trigger"
-                                data-success-param-alert-text="Blocked User Successfully"
+                                data-success-param-alert-text="Blocked user successfully"
                                 data-success-param-trigger-events="users.update"
                                 data-failure="alert"
-                                data-failure-param-alert-text="Failed to Block User"
+                                data-failure-param-alert-text="Failed to block user"
                                 data-failure-param-alert-classname="error">
 
                                 <button name="status" type="submit" class="danger fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>">Block Account</button>
@@ -132,10 +132,10 @@
                                 data-event="submit"
                                 data-param-user-id="{{router.params.id}}"
                                 data-success="alert,trigger"
-                                data-success-param-alert-text="Activated User Successfully"
+                                data-success-param-alert-text="Activated user successfully"
                                 data-success-param-trigger-events="users.update"
                                 data-failure="alert"
-                                data-failure-param-alert-text="Failed to Activate User"
+                                data-failure-param-alert-text="Failed to activate user"
                                 data-failure-param-alert-classname="error">
 
                                 <button name="status" type="submit" class="fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_ACTIVATED; ?>">Activate Account</button>
diff --git a/app/views/home/auth/join.phtml b/app/views/home/auth/join.phtml
index 5996ff77b5..e5c0f6e72d 100644
--- a/app/views/home/auth/join.phtml
+++ b/app/views/home/auth/join.phtml
@@ -12,7 +12,7 @@
         data-param-secret="{{router.params.secret}}"
         data-success="redirect,alert,trigger"
         data-success-param-redirect-url="/console?project={{router.params.project}}"
-        data-success-param-alert-text="Joined Team Successfully"
+        data-success-param-alert-text="Joined team successfully"
         data-success-param-trigger-events="teams.updateMembershipStatus"
         data-failure="redirect,alert"
         data-success-param-redirect-url="/console"