diff --git a/changes.sexp b/changes.sexp
index 15864a4..41af928 100644
--- a/changes.sexp
+++ b/changes.sexp
@@ -19,7 +19,11 @@
 
   (:bugfix
    "Configurations involving the" (:verb "warnings-ng") "plugin should no
-    longer break with every update of the plugin (Thanks to Robert Haschke)."))
+    longer break with every update of the plugin (Thanks to Robert Haschke).")
+
+  (:bugfix
+   "The variables" (:verb "scm.username") "and" (:verb "scm.password")
+   "are handled correctly."))
 
  (:release "0.33" "2020-12-07"
 
diff --git a/src/commands/functions-input.lisp b/src/commands/functions-input.lisp
index a097d20..28efd36 100644
--- a/src/commands/functions-input.lisp
+++ b/src/commands/functions-input.lisp
@@ -1,6 +1,6 @@
 ;;;; functions-input.lisp --- Functions for loading recipes.
 ;;;;
-;;;; Copyright (C) 2017, 2018, 2019 Jan Moringen
+;;;; Copyright (C) 2017-2022 Jan Moringen
 ;;;;
 ;;;; Author: Jan Moringen <jmoringe@techfak.uni-bielefeld.de>
 
@@ -282,8 +282,15 @@
                    versions)
               (values (hash-table-values infos) version->info))))
          ((&flet+ analyze-group ((info . versions))
-            (let+ (((&plist-r/o (repository :repository)) info)
-                   (other-info (remove-from-plist info :repository))
+            (let+ (((&plist-r/o (repository :repository)
+                                (username   :scm.username)
+                                (password   :scm.password))
+                    info)
+                   (other-info (append
+                                (remove-from-plist
+                                 info :repository :scm.username :scm.password)
+                                (when username (list :username username))
+                                (when password (list :password password))))
                    ((&values version-infos version->info)
                     (compute-version-infos versions))
                    (results (apply #'analysis:analyze repository :auto