diff --git a/src/server/db.go b/src/server/db.go
index d8b81f0..9f10855 100644
--- a/src/server/db.go
+++ b/src/server/db.go
@@ -161,7 +161,7 @@ func (d *Database) Create(content []byte, password []byte, encryptionKey string,
 		note.Encrypted = true
 	}
 
-	if password != nil {
+	if len(password) > 0 {
 		hash, err := bcrypt.GenerateFromPassword(password, bcrypt.DefaultCost)
 		if err != nil {
 			return nil, err
diff --git a/src/server/handlers_web.go b/src/server/handlers_web.go
index fc24035..ba39258 100644
--- a/src/server/handlers_web.go
+++ b/src/server/handlers_web.go
@@ -177,8 +177,11 @@ func (h *CreateNoteWithFormHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 	}
 
 	logger.Debug("building note url")
+
 	var scheme = "http://"
-	if r.TLS != nil {
+	if proto := r.Header.Get("X-Forwarded-Proto"); proto != "" {
+		scheme = proto + "://"
+	} else if r.TLS != nil {
 		scheme = "https://"
 	}