diff --git a/Cargo.lock b/Cargo.lock
index 7879adb..6f4c3ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -319,6 +319,15 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 replace = "diesel_migrations 1.1.0 (git+https://github.com/diesel-rs/diesel)"
 
+[[package]]
+name = "dirs"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "dotenv"
 version = "0.9.0"
@@ -1164,7 +1173,7 @@ dependencies = [
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "untrusted 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1327,6 +1336,7 @@ dependencies = [
  "colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crc24 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "diesel 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dirs 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "dotenv 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.11.0 (git+https://github.com/rust-lang-nursery/error-chain)",
@@ -1420,7 +1430,7 @@ name = "ssh-wire"
 version = "0.1.0"
 source = "git+https://github.com/kryptco/ssh-wire#3121a9354f842de4779ce5bfa9aceaf9fd4f66f3"
 dependencies = [
- "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "jni 0.9.3 (git+https://github.com/prevoty/jni-rs)",
  "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1428,7 +1438,7 @@ dependencies = [
  "ring 0.12.1 (git+https://github.com/kryptco/ring)",
  "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "untrusted 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1739,7 +1749,7 @@ dependencies = [
 
 [[package]]
 name = "untrusted"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1896,6 +1906,7 @@ dependencies = [
 "checksum diesel_derives2 1.1.0 (git+https://github.com/diesel-rs/diesel)" = "<none>"
 "checksum diesel_migrations 1.1.0 (git+https://github.com/diesel-rs/diesel)" = "<none>"
 "checksum diesel_migrations 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0928a7d6f27c849954185416bd59439837de55fbc89e2985b0e46e756ae4e3da"
+"checksum dirs 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "37a76dd8b997af7107d0bb69d43903cf37153a18266f8b3fdb9911f28efb5444"
 "checksum dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6f0e2bb24d163428d8031d3ebd2d2bd903ad933205a97d0f18c7c1aade380f3"
 "checksum dotenv 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "400b347fe65ccfbd8f545c9d9a75d04b0caf23fec49aaa838a9a05398f94c019"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
@@ -2053,7 +2064,7 @@ dependencies = [
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
-"checksum untrusted 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70afa43c8c5d23a53a3c39ec9b56232c5badc19f6bb5ad529c1d6448a7241365"
+"checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
 "checksum url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa35e768d4daf1d85733418a49fb42e10d7f633e394fccab4ab7aba897053fe2"
 "checksum users 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "99ab1b53affc9f75f57da4a8b051a188e84d20d43bea0dd9bd8db71eebbca6da"
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
diff --git a/sigchain_client/Cargo.toml b/sigchain_client/Cargo.toml
index 1f2592a..06a58a7 100644
--- a/sigchain_client/Cargo.toml
+++ b/sigchain_client/Cargo.toml
@@ -14,6 +14,7 @@ byteorder = "1.1.0"
 clap = "2.29.2"
 colored = "1.5.2"
 crc24 = "0.1.6"
+dirs = "1.0.2"
 dotenv = "0.9.0"
 env_logger = "0.5.2"
 error-chain = {git = "https://github.com/rust-lang-nursery/error-chain"}
diff --git a/sigchain_client/src/krd_client/mod.rs b/sigchain_client/src/krd_client/mod.rs
index e1f2d2f..88a88b0 100644
--- a/sigchain_client/src/krd_client/mod.rs
+++ b/sigchain_client/src/krd_client/mod.rs
@@ -1,4 +1,4 @@
-use {env, serde, errors, serde_json, enclave_protocol};
+use {serde, errors, serde_json, enclave_protocol};
 use super::Result;
 
 extern crate hyperlocal;
@@ -14,9 +14,7 @@ use self::hyper::{Client};
 extern crate tokio_core;
 use self::tokio_core::reactor::Core;
 
-extern crate users;
-use self::users::get_user_by_name;
-use self::users::os::unix::UserExt;
+extern crate dirs;
 
 use std::path::PathBuf;
 
@@ -28,7 +26,7 @@ use std::fs::OpenOptions;
 use std::fs;
 
 pub fn kr_path() -> Result<PathBuf> {
-    let home_path = env::home_dir();
+    let home_path = dirs::home_dir();
     let mut kr_path = match home_path {
         Some(home_path) => { home_path }
         _ => {