diff --git a/lib/util.php b/lib/util.php
index 608938c4c0..f1f3437eb3 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1241,7 +1241,9 @@ function common_local_url($action, $args=null, $params=null, $fragment=null, $ad
         $r = Router::get();
         $path = $r->build($action, $args, $params, $fragment);
 
-        $ssl = StatusNet::isHTTPS() || common_is_sensitive($action);
+        $ssl = common_config('site', 'ssl') === 'always'
+                || StatusNet::isHTTPS()
+                || common_is_sensitive($action);
 
         if (common_config('site','fancy')) {
             $url = common_path($path, $ssl, $addSession);