diff --git a/mod/photos.php b/mod/photos.php
index 5b81e18a7..65bf866f1 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -650,10 +650,10 @@ function photos_content(&$a) {
 		$albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
 		if(count($a->data['albums'])) {
 			foreach($a->data['albums'] as $album) {
-				if(($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
+				if($album['text'] === '') 
 					continue;
-				$selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
-				$albumselect .= '<option value="' . $album['album'] . '"' . $selected . '>' . $album['album'] . '</option>';
+				$selected = (($selname === $album['text']) ? ' selected="selected" ' : '');
+				$albumselect .= '<option value="' . $album['text'] . '"' . $selected . '>' . $album['text'] . '</option>';
 			}
 		}
 
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index b74c73fd3..935b2df0d 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -8,7 +8,7 @@
 {{if $albums}}
 <ul>
 {{foreach $albums as $al}}
-<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.album}}</a></li>
+<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a></li>
 {{/foreach}}
 </ul>
 {{/if}}