diff --git a/docs/otp.md b/docs/otp.md
index 22d6353..932279b 100644
--- a/docs/otp.md
+++ b/docs/otp.md
@@ -13,15 +13,15 @@ In order to enable two factor authentication the following steps are required.
 
 * Generate server configuration with `-2` option
 
-        docker run --volumes-from $OVPN_DATA --rm fabn/openvpn ovpn_genconfig -u udp://vpn.example.com -2
+        docker run --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_genconfig -u udp://vpn.example.com -2
 
 * Generate your client certificate (possibly without a password since you're using OTP)
 
-        docker run --volumes-from $OVPN_DATA --rm -it fabn/openvpn easyrsa build-client-full <user> nopass
+        docker run --volumes-from $OVPN_DATA --rm -it kylemanna/openvpn easyrsa build-client-full <user> nopass
 
 * Generate authentication configuration for your client. -t is needed to show QR code, -i is optional for interactive usage
 
-        docker run --volumes-from $OVPN_DATA --rm -t fabn/openvpn ovpn_otp_user <user>
+        docker run --volumes-from $OVPN_DATA --rm -t kylemanna/openvpn ovpn_otp_user <user>
 
 The last step will generate OTP configuration for the provided user with the following options
 
@@ -62,11 +62,13 @@ If something is not working you can verify your PAM setup with these commands
 
 ```
 # Start a shell in container
-docker run --volumes-from $OVPN_DATA --rm -it fabn/openvpn bash
-# Then in container install pamtester utility
-apt-get update && apt-get install -y pamtester
+docker run --volumes-from $OVPN_DATA --rm -it kylemanna/openvpn bash
+# Then in container you have pamtester utility already installed
+which pamtester
 # To check authentication use this command that will prompt for a valid code from Authenticator APP
 pamtester -v openvpn <user> authenticate
 ```
 
+In the last command `<user>` should be replaced by the exact string you used in the ovpn_otp_user command.
+
 If you configured everything correctly you should get authenticated by entering a OTP code from the app.