diff --git a/lib/auth_web/controllers/apikey_controller.ex b/lib/auth_web/controllers/apikey_controller.ex
index 10027e20..cc5af3e5 100644
--- a/lib/auth_web/controllers/apikey_controller.ex
+++ b/lib/auth_web/controllers/apikey_controller.ex
@@ -33,14 +33,10 @@ defmodule AuthWeb.ApikeyController do
   def create(conn, %{"apikey" => apikey_params}) do
     IO.inspect(apikey_params, label: "apikey_params")
     person_id = conn.assigns.decoded.id
-    secret = Fields.AES.encrypt(person_id) |> Base58.encode
-    |> IO.inspect(label: "secret")
 
-    client = Fields.AES.encrypt(person_id) |> Base58.encode
-    |> IO.inspect(label: "client")
     params = Map.merge(apikey_params, %{
-      "client_secret" => secret,
-      "client_id" => client,
+      "client_secret" => encrypt_encode(person_id),
+      "client_id" => encrypt_encode(person_id),
       "person_id" => person_id
       })
     case Apikey.create_apikey(params) do
diff --git a/lib/auth_web/templates/apikey/show.html.eex b/lib/auth_web/templates/apikey/show.html.eex
index e85b4622..6f5c0ecd 100644
--- a/lib/auth_web/templates/apikey/show.html.eex
+++ b/lib/auth_web/templates/apikey/show.html.eex
@@ -1,17 +1,16 @@
-<h1>Show Apikey</h1>
+<h1>Your DWYL_API_KEY</h1>
 
 <div>
   <p>
-    <strong>DWYL_API_KEY:</strong>
-    <div style="width:420px; font-size: 1.2em;
+    <div style="width:470px; font-size: 1.2em;
     overflow-wrap: break-word; font-family: monospace;
     border: 1px solid black; padding: 10px; background-color: #EBEDEF;">
-    <%= @apikey.client_id %><%= @apikey.client_secret %>
+    <%= @apikey.client_id %>/<%= @apikey.client_secret %>
     </div>
   </p>
 
   <p>
-    <strong>Name:</strong>
+    <strong>Key Name:</strong>
     <%= @apikey.name %>
   </p>
 
@@ -21,7 +20,7 @@
   </p>
 
   <p>
-    <strong>Url:</strong>
+    <strong>URL:</strong>
     <%= @apikey.url %>
   </p>