diff --git a/project/backend/ui.c b/project/backend/ui.c
index 400e888..73f7d80 100644
--- a/project/backend/ui.c
+++ b/project/backend/ui.c
@@ -119,6 +119,9 @@ void ui_quit(UIManager* manager) {
 
     if(manager->page == 0) {
         manager->running = false;
+    } else if (manager->page == 3) {
+        manager->p_ready = false;
+        manager->page = 2;
     } else {
         manager->p_ready = false;
         manager->page = 0;
@@ -249,8 +252,12 @@ void ui_p_view(Canvas* canvas, UIManager* manager) {
             break;
         case Ok:
             char* pass_name = manager->manager->names[manager->selection];
-            manager_loadpass(manager->manager, pass_name);
 
+            if (strcmp(pass_name, "") == 0) {
+                break;
+            }
+
+            manager_loadpass(manager->manager, pass_name);
             manager->page = 3;
             break;
         default:
@@ -265,9 +272,19 @@ void ui_p_view(Canvas* canvas, UIManager* manager) {
     canvas_draw_str(canvas, 106, 62, page);
 }
 void ui_p_vpass(Canvas* canvas, UIManager* manager) {
-    // TODO: Do this after figuring out how to select password
-    UNUSED(canvas);
-    UNUSED(manager);
+    canvas_set_font(canvas, FontPrimary);
+    canvas_draw_str(canvas, 2, 11, manager->manager->current->name);
+
+    canvas_set_font(canvas, FontSecondary);
+    canvas_draw_str(canvas, 12, 24, manager->manager->current->user);
+
+    canvas_set_font(canvas, FontSecondary);
+    canvas_draw_str(canvas, 12, 34, manager->manager->current->phrase);
+
+    /* canvas_draw_icon(canvas, 98, 55, &I_ButtonCenter_7x7);
+
+    canvas_set_font(canvas, FontSecondary);
+    canvas_draw_str(canvas, 106, 62, "Send"); */
 }
 
 void ui_delete(UIManager* manager) {