diff --git a/plugins/geeknote/geeknote.plugin.zsh b/plugins/geeknote/geeknote.plugin.zsh
new file mode 100644
index 000000000..75e529a00
--- /dev/null
+++ b/plugins/geeknote/geeknote.plugin.zsh
@@ -0,0 +1,19 @@
+# ------------------------------------------------------------------------------
+#          FILE:  geeknote.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Georg Ogris (georg.ogris@gmail.com)
+#       VERSION:  0.0.1
+# ------------------------------------------------------------------------------
+
+
+# add to a new bookmark to Bookmarks
+function gnb() {
+	local link=$1
+	shift 1
+
+	geeknote create --title '"'"$link"'"' \
+	       	--content '"'"$link"'"' \
+		--notebook '"Bookmarks"' \
+		--tags '"readings"'
+		#--tags '"'"$@"'"'
+}
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 103041eef..422af7535 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -79,8 +79,10 @@ prompt_end() {
 
 # Context: user@hostname (who am I and where am I)
 prompt_context() {
-  if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+  if [[ "$USER" != "$DEFAULT_USER" ]]; then
     prompt_segment black default "%(!.%{%F{yellow}%}.)$USER@%m"
+  elif [[ "$USER" == "$DEFAULT_USER" && -n "$SSH_CLIENT" ]]; then
+    prompt_segment black default "%(!.%{%F{yellow}%}.)%m"
   fi
 }