diff --git a/pkg/server/helper.go b/pkg/server/helper.go
index 4b6c475..b8d81f7 100644
--- a/pkg/server/helper.go
+++ b/pkg/server/helper.go
@@ -15,19 +15,14 @@ const (
 )
 
 func duration(duration, mode string) (d time.Duration, err error) {
-	var m int
-	m, _ = strconv.Atoi(mode)
-	switch m {
-	case 0:
-		err = errors.New("invalid mode")
-		return
-	case 1:
+	switch mode {
+	case "1":
 		d, err = time.ParseDuration(duration)
 		if err != nil {
 			err = errors.New("could not parse duration")
 			return
 		}
-	case 2:
+	case "2":
 		var t int
 		t, err = strconv.Atoi(duration)
 		if err != nil {
@@ -35,6 +30,9 @@ func duration(duration, mode string) (d time.Duration, err error) {
 			return
 		}
 		d = time.Duration(int(day) * t)
+	default:
+		err = errors.New("invalid mode")
+		return
 	}
 
 	if d < min {
diff --git a/pkg/server/templates.go b/pkg/server/templates.go
index d2a9129..a110ae2 100644
--- a/pkg/server/templates.go
+++ b/pkg/server/templates.go
@@ -510,9 +510,9 @@ const (
         <div class="card-header">
             <strong>{{.BodyTitle}}</strong>
             {{if .Data.Secret}}
-            <a href="/user/totp/{{.Data.Username}}" class="btn btn-sm btn-danger">Disable TOTP</a>
+            <a href="/user/totp/{{.Data.Username}}" class="btn btn-sm btn-danger float-right">Disable TOTP</a>
             {{else}}
-            <a href="/user/totp/{{.Data.Username}}" class="btn btn-sm btn-success">Enable TOTP</a>
+            <a href="/user/totp/{{.Data.Username}}" class="btn btn-sm btn-success float-right">Enable TOTP</a>
             {{end}}
         </div>
         <div class="card-body">
@@ -658,7 +658,7 @@ const (
     <div class="col-xs-4 offset-4">
         <div class="card border-primary mx-auto">
         <div class="card-header">
-            <strong>{{.BodyTitle}}</strong>
+            <strong>{{.BodyTitle}} - {{.Data.Username}}</strong>
         </div>
         <div class="card-body">
             <form class="form-horizontal" action="/user/totp/{{.Data.Username}}" method="post">
diff --git a/templates/userEdit.html b/templates/userEdit.html
index 077b4c3..c4ccb22 100644
--- a/templates/userEdit.html
+++ b/templates/userEdit.html
@@ -6,9 +6,9 @@
         <div class="card-header">
             <strong>{{.BodyTitle}}</strong>
             {{if .Data.Secret}}
-            <a href="/user/totp/{{.Data.Username}}" class="btn btn-sm btn-danger">Disable TOTP</a>
+            <a href="/user/totp/{{.Data.Username}}" class="btn btn-sm btn-danger float-right">Disable TOTP</a>
             {{else}}
-            <a href="/user/totp/{{.Data.Username}}" class="btn btn-sm btn-success">Enable TOTP</a>
+            <a href="/user/totp/{{.Data.Username}}" class="btn btn-sm btn-success float-right">Enable TOTP</a>
             {{end}}
         </div>
         <div class="card-body">
diff --git a/templates/userTotp.html b/templates/userTotp.html
index dc5b834..cb7db80 100644
--- a/templates/userTotp.html
+++ b/templates/userTotp.html
@@ -4,7 +4,7 @@
     <div class="col-xs-4 offset-4">
         <div class="card border-primary mx-auto">
         <div class="card-header">
-            <strong>{{.BodyTitle}}</strong>
+            <strong>{{.BodyTitle}} - {{.Data.Username}}</strong>
         </div>
         <div class="card-body">
             <form class="form-horizontal" action="/user/totp/{{.Data.Username}}" method="post">