diff --git a/html/changepassword.php b/html/changepassword.php
index 6177d41..3d3deec 100644
--- a/html/changepassword.php
+++ b/html/changepassword.php
@@ -28,11 +28,11 @@
 					if(strcasecmp($_SESSION['username'], $usernamejson[$ln]['username']) == 0) {
 						echo '					<option value="'.$usernamejson[$ln]['username'].'"';
 						echo ' selected="selected"';
-						echo '>'.$usernamejson[$ln]['firstname']. " " .$usernamejson[$ln]['lastname'].'</option>'.PHP_EOL;
+						echo '>'.$usernamejson[$ln]['username'].'</option>'.PHP_EOL;
 					}
 					else if($_SESSION['accesslevel'] == "superadmin") {
 						echo '					<option value="'.$usernamejson[$ln]['username'].'"';
-						echo '>'.$usernamejson[$ln]['firstname']. " " .$usernamejson[$ln]['lastname'].'</option>'.PHP_EOL;
+						echo '>'.$usernamejson[$ln]['username'].'</option>'.PHP_EOL;
 					}
 					$ln++;
 				}
@@ -54,4 +54,4 @@
 		</table>
 		</form>
 		</body>
-</html>
\ No newline at end of file
+</html>