diff --git a/templates/createPi.html b/templates/createPi.html
index 01f134ef2af8e3d50abceebbfb788dfec0e02fe1..cf3656681ed14913432cf3aa63316b1ffc9b1d00 100644
--- a/templates/createPi.html
+++ b/templates/createPi.html
@@ -35,13 +35,13 @@
                 </div>
             </div>
             <div class="form-group row">
-              <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama</label>
+              <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama Lengkap</label>
               <div class="col-sm-9">
-                  <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')">
+                  <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')" value="{{ request.user.mahasiswa.nama_lengkap }}">
               </div>
           </div>
             <div id="autocomplete" class="form-group row">
-              <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen</label>
+              <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen Pembimbing</label>
               <div class="col-sm-9">
               <input  type="text" class="form-control" id="{{ form.dosen.id_for_label }}" name="{{ form.dosen.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')"/>
               <ul class="autocomplete-result-list" ></ul>
diff --git a/templates/createPiDosen.html b/templates/createPiDosen.html
index 108b0d53d535d7575be135535baf10906e294314..1bfe49364a692f6c02f2116eb1c319d89b68b00f 100644
--- a/templates/createPiDosen.html
+++ b/templates/createPiDosen.html
@@ -36,9 +36,9 @@
                 </div>
             </div>
             <div class="form-group row">
-              <label for="{{ form.judul.id_for_label }}" class="col-sm-3 col-form-label">Nama</label>
+              <label for="{{ form.judul.id_for_label }}" class="col-sm-3 col-form-label">Nama Lengkap</label>
               <div class="col-sm-9">
-                  <input type="text" class="form-control" id="{{ form.judul.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')">
+                  <input type="text" class="form-control" id="{{ form.judul.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')" value="{{ request.user.dosen.nama_lengkap }}">
               </div>
           </div>
             <div id="autocomplete" class="form-group row">
diff --git a/templates/createProceeding.html b/templates/createProceeding.html
index bf00e8610f2b144c72e36f57ff139a77cf9ba8fc..3456449d58303988ba7e881bebe742483d60a46d 100644
--- a/templates/createProceeding.html
+++ b/templates/createProceeding.html
@@ -36,13 +36,13 @@
                 </div>
             </div>
             <div class="form-group row">
-              <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama</label>
+              <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama Lengkap</label>
               <div class="col-sm-9">
-                  <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')">
+                  <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')" value="{{ request.user.mahasiswa.nama_lengkap }}">
               </div>
           </div>
             <div id="autocomplete" class="form-group row">
-              <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen</label>
+              <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen Pembimbing</label>
               <div class="col-sm-9">
               <input  type="text" class="form-control" id="{{ form.dosen.id_for_label }}" name="{{ form.dosen.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')"/>
               <ul class="autocomplete-result-list" ></ul>
diff --git a/templates/createProceedingDosen.html b/templates/createProceedingDosen.html
index dd5d64338544b49e7beb81382c83180437952c81..93335bcba2d53049a0c7bd9dea3a969cf690ae83 100644
--- a/templates/createProceedingDosen.html
+++ b/templates/createProceedingDosen.html
@@ -36,9 +36,9 @@
                 </div>
             </div>
             <div class="form-group row">
-              <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama</label>
+              <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama Lengkap</label>
               <div class="col-sm-9">
-                  <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')">
+                  <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')" value="{{ request.user.dosen.nama_lengkap }}">
               </div>
           </div>
             <div id="autocomplete" class="form-group row">
diff --git a/templates/createSm.html b/templates/createSm.html
index dd0ad07da6ad0c12ad3eac7f59ab66804835cbaa..08527748d13877f62c66517126fb87dad2b0b0c2 100644
--- a/templates/createSm.html
+++ b/templates/createSm.html
@@ -35,13 +35,13 @@
                 </div>
             </div>
             <div class="form-group row">
-              <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama</label>
+              <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama Lengkap</label>
               <div class="col-sm-9">
-                  <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')">
+                  <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')" value="{{ request.user.mahasiswa.nama_lengkap }}">
               </div>
           </div>
             <div id="autocomplete" class="form-group row">
-              <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen</label>
+              <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen Pembimbing</label>
               <div class="col-sm-9">
               <input  type="text" class="form-control" id="{{ form.dosen.id_for_label }}" name="{{ form.dosen.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')"/>
               <ul class="autocomplete-result-list" ></ul>
diff --git a/templates/searchResultSmAdmin.html b/templates/searchResultSmAdmin.html
index 65b8dfc3ccf605f6c8034858c5c6ad7c5d30b270..e674414c6d61a830f82c02265d048cdc779515fa 100644
--- a/templates/searchResultSmAdmin.html
+++ b/templates/searchResultSmAdmin.html
@@ -60,8 +60,10 @@ box-shadow: 0 0 40px rgba(51, 51, 51, .1);
           <thead>
               <tr>
                   <th onclick="sortTable(0)">Semester &uarr;</th>
-                  <th onclick="sortTable(1)">Judul &uarr;</th>
-                  <th onclick="sortTable(2)">Topik &uarr;</th>
+                  <th onclick="sortTable(1)">Nama &uarr;</th>
+                  <th onclick="sortTable(2)">Pembimbing &uarr;</th>
+                  <th onclick="sortTable(3)">Judul &uarr;</th>
+                  <th onclick="sortTable(4)">Topik &uarr;</th>
                   <th>PDF Studi</th>
                 </tr>
           </thead>
@@ -69,6 +71,8 @@ box-shadow: 0 0 40px rgba(51, 51, 51, .1);
             <tr>
               <form method="get">
                 <td>{% render_field sm_filter.form.semester class="form-control" %}</td>
+                <td>{% render_field sm_filter.form.nama class="form-control" %}</td>
+                <td>{% render_field sm_filter.form.dosen class="form-control" %}</td>
                 <td>{% render_field sm_filter.form.judul class="form-control" %}</td>
                 <td>{% render_field sm_filter.form.topik class="form-control" %}</td>
                 <td colspan="2"><button type="submit" class="btn btn-primary">
@@ -79,6 +83,8 @@ box-shadow: 0 0 40px rgba(51, 51, 51, .1);
         {% for sms in sm_filter.qs %}
             <tr>
                 <td>{{ sms.semester }}</td>
+                <td>{{ sms.nama }}</td>
+                <td>{{ sms.dosen }}</td>
                 <td><a href="{% url 'detail_sm_admin' id=sms.id %}">{{sms.judul}}</a></td>
                 <td>{{ sms.topik }}</td>
                 <td>{% if sms.pdf %}
diff --git a/templates/updatePi.html b/templates/updatePi.html
index 75aa382781412251611ff9593ad29f857be93ee5..8661d73e111a47d3e633e90c35c5b423bc64773f 100644
--- a/templates/updatePi.html
+++ b/templates/updatePi.html
@@ -41,11 +41,11 @@
           <input type="text" class="form-control" id="topik" name="topik" value="{{ pi.topik }}">
         </div>
         <div class="form-group">
-          <label for="nama">Nama:</label>
+          <label for="nama">Nama Lengkap:</label>
           <input type="text" class="form-control" id="nama" name="nama" value="{{ pi.nama }}">
         </div>
         <div id="autocomplete" class="form-group">
-          <label for="dosen">Dosen:</label>
+          <label for="dosen">Dosen Pembimbing:</label>
           <input  type="text" class="form-control" id="dosen" name="dosen" value="{{ pi.dosen }}">
           <ul class="autocomplete-result-list" ></ul>
       </div>
diff --git a/templates/updatePiDosen.html b/templates/updatePiDosen.html
index 02d2ee9cc19ff2bf03e52ad288c1ad485dce0739..7109e91c73365d65d6f4a481bb5ca4be3aa95cde 100644
--- a/templates/updatePiDosen.html
+++ b/templates/updatePiDosen.html
@@ -40,7 +40,7 @@
           <input type="text" class="form-control" id="topik" name="topik" value="{{ pi.topik }}">
         </div>
         <div class="form-group">
-          <label for="nama">Nama:</label>
+          <label for="nama">Nama Lengkap:</label>
           <input type="text" class="form-control" id="nama" name="nama" value="{{ pi.nama }}">
         </div>
         <div id="autocomplete" class="form-group">
diff --git a/templates/updateProceeding.html b/templates/updateProceeding.html
index 7a8ac235d93eda78e5dc94431dd068035c6df1cc..9f880604ea9408b376247925a2b66bf331b1d962 100644
--- a/templates/updateProceeding.html
+++ b/templates/updateProceeding.html
@@ -40,11 +40,11 @@
           <input type="text" class="form-control" id="topik" name="topik" value="{{ proceeding.topik }}">
         </div>
         <div class="form-group">
-          <label for="nama">Nama:</label>
+          <label for="nama">Nama Lengkap:</label>
           <input type="text" class="form-control" id="nama" name="nama" value="{{ proceeding.nama }}">
         </div>
         <div id="autocomplete" class="form-group">
-          <label for="dosen">Dosen:</label>
+          <label for="dosen">Dosen Pembimbing:</label>
           <input  type="text" class="form-control" id="dosen" name="dosen" value="{{ proceeding.dosen }}">
           <ul class="autocomplete-result-list" ></ul>
       </div>
diff --git a/templates/updateProceedingDosen.html b/templates/updateProceedingDosen.html
index fd9648243220625e35ee4f6b1441c11326876fe8..29194c7bfb8adf8887f1f8fde93da94b892590d1 100644
--- a/templates/updateProceedingDosen.html
+++ b/templates/updateProceedingDosen.html
@@ -40,7 +40,7 @@
           <input type="text" class="form-control" id="topik" name="topik" value="{{ proceeding.topik }}">
         </div>
         <div class="form-group">
-          <label for="nama">Nama:</label>
+          <label for="nama">Nama Lengkap:</label>
           <input type="text" class="form-control" id="nama" name="nama" value="{{ proceeding.nama }}">
         </div>
         <div id="autocomplete" class="form-group">