diff --git a/src/scripts/init.js b/src/scripts/init.js
index 935f3d3..4468f51 100755
--- a/src/scripts/init.js
+++ b/src/scripts/init.js
@@ -19,12 +19,12 @@ $(document).ready(function() {
 		else								contextMenu.albumTitle(album.getID(), e);
 	});
 	header.dom('#button_share').on(eventName, function(e) {
-		if (photo.json.public==1||photo.json.public==2)	contextMenu.sharePhoto(photo.getID(), e);
-		else											photo.setPublic(photo.getID(), e);
+		if (photo.json.public==='1'||photo.json.public==='2')	contextMenu.sharePhoto(photo.getID(), e);
+		else													photo.setPublic(photo.getID(), e);
 	});
 	header.dom('#button_share_album').on(eventName, function(e) {
-		if (album.json.public==1)	contextMenu.shareAlbum(album.getID(), e);
-		else						album.setPublic(album.getID(), e);
+		if (album.json.public==='1')	contextMenu.shareAlbum(album.getID(), e);
+		else							album.setPublic(album.getID(), true, e);
 	});
 	header.dom('#button_signin')		.on(eventName, lychee.loginDialog);
 	header.dom('#button_settings')		.on(eventName, contextMenu.settings);
diff --git a/src/scripts/photo.js b/src/scripts/photo.js
index 9755c44..9a7749f 100644
--- a/src/scripts/photo.js
+++ b/src/scripts/photo.js
@@ -418,7 +418,7 @@ photo.setStar = function(photoIDs) {
 
 photo.setPublic = function(photoID, e) {
 
-	if (photo.json.public==2) {
+	if (photo.json.public==='2') {
 
 		var action;