diff --git a/server/src/api.rs b/server/src/api.rs
index a80083a..c45ddbd 100644
--- a/server/src/api.rs
+++ b/server/src/api.rs
@@ -266,8 +266,8 @@ struct CertInfo {
 impl From<&Certificate> for CertInfo {
     fn from(cert: &Certificate) -> Self {
         let validity = cert
-            .valid_after_time()
-            .duration_since(cert.valid_before_time())
+            .valid_before_time()
+            .duration_since(cert.valid_after_time())
             .unwrap();
         let validity_days = validity.as_secs() / ((60 * 60) * 24);
         let host_key = if cert.cert_type().is_host() {
@@ -490,12 +490,12 @@ mod tests {
         let (cert_first, cert_newer, cert_outdated) = {
             (
                 user_cert(ca.clone(), user.clone(), Duration::from_secs(30)),
-                user_cert(ca.clone(), user.clone(), Duration::from_secs(60)),
+                user_cert(ca.clone(), user.clone(), Duration::from_secs(600)),
                 user_cert(ca.clone(), user.clone(), Duration::from_secs(3)),
             )
         };
         let res = put_cert_update(PutCert, State(state.clone()), CertificateBody(cert_first)).await;
-        assert!(res.is_ok());
+        assert!(dbg!(res).is_ok());
         let res = put_cert_update(PutCert, State(state.clone()), CertificateBody(cert_newer)).await;
         assert!(res.is_ok());
         let res = put_cert_update(