diff --git a/HostProp.hs b/HostProp.hs
index 25120e2..84ae934 100644
--- a/HostProp.hs
+++ b/HostProp.hs
@@ -32,6 +32,7 @@ getProperties "clam.kitenet.net" =
 		Ssh.passwordAuthentication False
 	, check (Ssh.hasAuthorizedKeys "root") $
 		User.lockedPassword "root"
+	, Apt.installed ["vim"]
 	, User.nonsystem "joey"
 	, Apt.installed ["sudo"]
 	, lineInFile "/etc/sudoers" "joey ALL=(ALL:ALL) ALL"
diff --git a/Property/Ssh.hs b/Property/Ssh.hs
index c5902d9..3883606 100644
--- a/Property/Ssh.hs
+++ b/Property/Ssh.hs
@@ -18,11 +18,12 @@ sshdConfig = "/etc/ssh/sshd_config"
 
 setSshdConfig :: String -> Bool -> Property
 setSshdConfig setting allowed = combineProperties desc
-	[ lineNotInFile sshdConfig (setting ++ sshBool (not allowed))
-	, lineInFile sshdConfig (setting ++ sshBool allowed)
+	[ lineNotInFile sshdConfig $ sshLine (not allowed)
+	, lineInFile sshdConfig $ sshLine allowed
 	] `onChange` restartSshd
   where
 	desc = unwords [ "ssh config:", setting, sshBool allowed ]
+	sshline v = setting ++ " " ++ sshBool v
 
 permitRootLogin :: Bool -> Property
 permitRootLogin = setSshdConfig "PermitRootLogin"