diff --git a/db/db.go b/db/db.go
index 49d03af0..6dc81720 100644
--- a/db/db.go
+++ b/db/db.go
@@ -7,6 +7,7 @@ import (
 	"log"
 	"net/mail"
 	"os"
+	"time"
 
 	"github.com/coopernurse/gorp"
 	"github.com/jordan-wright/gophish/config"
@@ -304,6 +305,13 @@ func PutGroup(g *models.Group, uid int64) error {
 			insertTargetIntoGroup(nt, g.Id)
 		}
 	}
+	// Update the group
+	g.ModifiedDate = time.Now()
+	_, err = Conn.Update(g)
+	if err != nil {
+		Logger.Println(err)
+		return err
+	}
 	return nil
 }
 
diff --git a/templates/dashboard.html b/templates/dashboard.html
index 7d5f8bbe..649e368c 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -54,7 +54,7 @@
             </table>
         </div>
         <!-- New Campaign Modal -->
-        <div class="modal" id="newCampaignModal" tabindex="-1" role="dialog" aria-labelledby="campaignModalLabel" aria-hidden="true">
+        <div class="modal" id="newCampaignModal" role="dialog" aria-labelledby="campaignModalLabel" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
@@ -67,7 +67,7 @@
                         </div>
                         <div class="form-group">
                             <label for="name">Name:</label>
-                            <input type="text" class="form-control" ng-model="campaign.name" id="name" placeholder="Campaign name">
+                            <input type="text" class="form-control" ng-model="campaign.name" id="name" placeholder="Campaign name" autofocus>
                             <br />
                             <label class="control-label" for="users">Groups:</label>
                             <form ng:submit="addGroup()">
diff --git a/templates/templates.html b/templates/templates.html
index 54ab85a8..614513f5 100644
--- a/templates/templates.html
+++ b/templates/templates.html
@@ -52,7 +52,7 @@
         </div>
     </div>
     <!-- New Template Modal -->
-    <div class="modal" id="newTemplateModal" tabindex="-1" role="dialog" aria-labelledby="templateModalLabel" aria-hidden="true">
+    <div class="modal" id="newTemplateModal" role="dialog" aria-labelledby="templateModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
@@ -63,7 +63,7 @@
                 <div class="modal-body">
                     <label class="control-label" for="name">Name:</label>
                     <div class="form-group">
-                        <input type="text" class="form-control" ng-model="template.name" placeholder="Template name" id="name" />
+                        <input type="text" class="form-control" ng-model="template.name" placeholder="Template name" id="name" autofocus/>
                     </div>
                     <!-- Nav tabs -->
                     <ul class="nav nav-tabs">
diff --git a/templates/users.html b/templates/users.html
index 81915190..6d164634 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -56,7 +56,7 @@
         </div>
     </div>
     <!-- New Group Modal -->
-    <div class="modal" id="newGroupModal" tabindex="-1" role="dialog" aria-labelledby="groupModalLabel" aria-hidden="true">
+    <div class="modal" id="newGroupModal" role="dialog" aria-labelledby="groupModalLabel" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
@@ -67,7 +67,7 @@
                 <div class="modal-body">
                     <label class="control-label" for="name">Name:</label>
                     <div class="form-group">
-                        <input type="text" class="form-control" ng-model="group.name" placeholder="Group name" id="name" />
+                        <input type="text" class="form-control" ng-model="group.name" placeholder="Group name" id="name" autofocus/>
                     </div>
                     <fieldset disabled>
                         <div class="form-group">