diff --git a/public/js/new_certificate.js b/public/js/new_certificate.js
index 548e635..ace778b 100644
--- a/public/js/new_certificate.js
+++ b/public/js/new_certificate.js
@@ -14,7 +14,7 @@ $(function () {
            return;
        }
 
-       var user = $('.user').text();
+       var user = $('#user-input').val();
 
        var keys = forge.pki.rsa.generateKeyPair(1024);
        var csr = forge.pki.createCertificationRequest();
diff --git a/views/panel/certificates/new.html.twig b/views/panel/certificates/new.html.twig
index b1e2243..275b0ff 100644
--- a/views/panel/certificates/new.html.twig
+++ b/views/panel/certificates/new.html.twig
@@ -50,6 +50,7 @@
                         </div>
                     </div>
                 </div>
+                <input type="hidden" value="{{ user.getUsername() }}" id="user-input">
             </div>
         </div>
     </div>