diff --git a/apt/create_instance.in b/apt/create_instance.in
index a77259c27a3a38452fbe3aff3135c19eae78cc70..0c3f1885a967460b4cc348ac9b13bd789da3e4f3 100755
--- a/apt/create_instance.in
+++ b/apt/create_instance.in
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (c) 2008-2014 University of Utah and the Flux Group.
+# Copyright (c) 2008-2015 University of Utah and the Flux Group.
 # 
 # {{{GENIPUBLIC-LICENSE
 # 
@@ -463,15 +463,12 @@ if ($localuser) {
 	# with the isaptkey flag (-a to addpubkey) so that we know
 	# which key in the DB it is. The reason for this is that the
 	# user might be a classic emulab user, but is now using the
-	# APT/Cloud UI. Class Emulab allows multiple keys, but the
-	# APT/Cloud UI only allows one (which is replaced in the DB
-	# if it changes). We do not want to expose the Emulab ssh key
-	# edit page, too messy. So always operate on the one apt key
-	# for all users.
+	# APT/Cloud UI. The key provided in the web interface will
+	# replace this key.
+	#
+	# XXX This is in flux, we now allow APT users to manage all
+	# their keys via the web interface.
 	#
-	if (!$emulab_user->isEmulab()) {
-	    $emulab_user->DeleteSSHKeys();
-	}
 	my ($fh, $keyfile) = tempfile(UNLINK => 0);
 	print $fh $sshkey;
 
diff --git a/www/aptui/quickvm_sup.php b/www/aptui/quickvm_sup.php
index 562e6339fa9c4980f1f80acde76e6dd701b5f12b..b03af3b9c21ab63967ca485d1e4445ccc9828206 100644
--- a/www/aptui/quickvm_sup.php
+++ b/www/aptui/quickvm_sup.php
@@ -269,6 +269,7 @@ $PAGEHEADER_FUNCTION = function($thinheader = 0, $ignore1 = NULL,
                    <li><a href='manage_profile.php'>Create Profile</a></li>
                    <li><a href='instantiate.php'>Start Experiment</a></li>
                    <li class='divider'></li>
+	           <li><a href='ssh-keys.php'>Manage SSH Keys</a></li>
 	           <li><a href='changepswd.php'>Change Password</a></li>
 	           <li><a href='logout.php'>Logout</a></li>";
 	if (ISADMIN() || STUDLY()) {