diff --git a/add_login_modal.php b/add_login_modal.php
index 0cbc7984..9eedcbeb 100644
--- a/add_login_modal.php
+++ b/add_login_modal.php
@@ -40,12 +40,12 @@
               </div>
             
               <div class="form-group">
-                <label>Username <strong class="text-danger">*</strong></label>
+                <label>Username</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                   </div>
-                  <input type="text" class="form-control" name="username" placeholder="Username" required>
+                  <input type="text" class="form-control" name="username" placeholder="Username">
                 </div>
               </div>
               
diff --git a/client_logins.php b/client_logins.php
index 9285ea53..fd0674e6 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -89,9 +89,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             if(empty($login_uri)){
               $login_uri_display = "-";
             }else{
-              $login_uri_display = "$login_uri <button class='btn btn-sm' data-clipboard-text='$login_uri'><i class='far fa-copy text-secondary'></i></button>";
+              $login_uri_display = "$login_uri<button class='btn btn-sm' data-clipboard-text='$login_uri'><i class='far fa-copy text-secondary'></i></button>";
             }
             $login_username = $row['login_username'];
+            if(empty($login_username)){
+              $login_username_display = "-";
+            }else{
+              $login_username_display = "$login_username<button class='btn btn-sm' data-clipboard-text='$login_username'><i class='far fa-copy text-secondary'></i></button>";
+            }
             $login_password = $row['login_password'];
             $login_otp_secret = $row['login_otp_secret'];
             if(empty($login_otp_secret)){
@@ -114,7 +119,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               </a>
             </td>
             <td><?php echo $login_uri_display; ?></td>
-            <td><?php echo $login_username; ?><button class="btn btn-sm" data-clipboard-text="<?php echo $login_username; ?>"><i class="far fa-copy text-secondary"></i></button></td>
+            <td><?php echo $login_username_display; ?></td>
             <td><?php echo $login_password; ?><button class="btn btn-sm" data-clipboard-text="<?php echo $login_password; ?>"><i class="far fa-copy text-secondary"></i></button></td>
             </td>
             <td><?php echo $otp_display; ?></td>
diff --git a/db.sql b/db.sql
index eac33fa7..e3d3bdab 100644
--- a/db.sql
+++ b/db.sql
@@ -503,7 +503,7 @@ CREATE TABLE `logins` (
   `login_name` varchar(200) NOT NULL,
   `login_category` varchar(200) DEFAULT NULL,
   `login_uri` varchar(200) DEFAULT NULL,
-  `login_username` varchar(200) NOT NULL,
+  `login_username` varchar(200) DEFAULT NULL,
   `login_password` varbinary(200) DEFAULT NULL,
   `login_otp_secret` varchar(200) DEFAULT NULL,
   `login_note` text DEFAULT NULL,
@@ -1011,4 +1011,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-08-18 22:28:45
+-- Dump completed on 2021-08-18 22:52:05
diff --git a/edit_login_modal.php b/edit_login_modal.php
index 2632f953..b668bf5a 100644
--- a/edit_login_modal.php
+++ b/edit_login_modal.php
@@ -40,12 +40,12 @@
               </div>
             
               <div class="form-group">
-                <label>Username <strong class="text-danger">*</strong></label>
+                <label>Username</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                   </div>
-                  <input type="text" class="form-control" name="username" placeholder="Username" value="<?php echo $login_username; ?>" required>
+                  <input type="text" class="form-control" name="username" placeholder="Username" value="<?php echo $login_username; ?>">
                 </div>
               </div>