diff --git a/css/60_photos.css b/css/60_photos.css
index 516784f2f..abcbef7be 100644
--- a/css/60_photos.css
+++ b/css/60_photos.css
@@ -104,6 +104,7 @@
 .photo-attribution span {
     padding: 4px 2px;
     color: #fff;
+    text-wrap: nowrap;
 }
 
 /* markers and sequences */
diff --git a/data/core.yaml b/data/core.yaml
index 46f4e4968..f59331cdb 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -1438,6 +1438,7 @@ en:
     title: Panoramax
     tooltip: "Street-level photos from Panoramax"
     report: "Report"
+    captured_by: "Captured by {username}"
     hd: "High resolution"
   street_side:
     minzoom_tooltip: "Zoom in to see street-side photos"
diff --git a/modules/services/panoramax.js b/modules/services/panoramax.js
index 2520d71e3..c200bf357 100644
--- a/modules/services/panoramax.js
+++ b/modules/services/panoramax.js
@@ -504,15 +504,19 @@ export default {
         }
 
         if (d.account_id) {
+            attribution
+                .append('span')
+                .text('|');
+
             let line2 = attribution
-                .append('div')
+                .append('span')
                 .attr('class', 'attribution-row');
 
             getUsername(d.account_id).then(function(username){
                 line2
                     .append('span')
                     .attr('class', 'captured_by')
-                    .text('Captured by: ' + username);
+                    .text(t('panoramax.captured_by', {username}));
             });
         }