diff --git a/view/js/mod_cover_photo.js b/view/js/mod_cover_photo.js
index b9af8ce5c..5b64b8b91 100644
--- a/view/js/mod_cover_photo.js
+++ b/view/js/mod_cover_photo.js
@@ -27,13 +27,7 @@
                         if (typeof($(image).parent()[0]) !== 'undefined') {
                             var imageparent = document.getElementById($(image).parent()[0].id);
                             $(imageparent).toggleClass('embed-photo-selected-photo');
-                        }
-                    });
-                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-                    $('#embed-photo-OKButton').click(function () {
-                        $('.embed-photo-selected-photo').each(function (index) {
-                            var href = $(this).attr('href');
+							var href = $(imageparent).attr('href');
                             $.post("embedphotos/photolink", {href: href},
                                 function(ddata) {
                                     if (ddata['status']) {
@@ -42,13 +36,16 @@
                                         window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
                                     }
                                     return false;
-                                },
-                            'json');
-                        });
-                        $('#embedPhotoModalBodyAlbumDialog').html('');
-                        $('#embedPhotoModalBodyAlbumDialog').off('click');
-                        $('#embedPhotoModal').modal('hide');
+								},
+                               'json');
+                            $('#embedPhotoModalBodyAlbumDialog').html('');
+                            $('#embedPhotoModalBodyAlbumDialog').off('click');
+                            $('#embedPhotoModal').modal('hide');
+						}
                     });
+
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
                 } else {
                     window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
                 }
diff --git a/view/js/mod_profile_photo.js b/view/js/mod_profile_photo.js
index 832da764b..c05c8e25e 100644
--- a/view/js/mod_profile_photo.js
+++ b/view/js/mod_profile_photo.js
@@ -27,13 +27,7 @@
                         if (typeof($(image).parent()[0]) !== 'undefined') {
                             var imageparent = document.getElementById($(image).parent()[0].id);
                             $(imageparent).toggleClass('embed-photo-selected-photo');
-                        }
-                    });
-                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-                    $('#embed-photo-OKButton').click(function () {
-                        $('.embed-photo-selected-photo').each(function (index) {
-                            var href = $(this).attr('href');
+							var href = $(imageparent).attr('href');
                             $.post("embedphotos/photolink", {href: href},
                                 function(ddata) {
                                     if (ddata['status']) {
@@ -44,13 +38,16 @@
                                         window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
                                     }
                                     return false;
-                                },
-                            'json');
-                        });
-                        $('#embedPhotoModalBodyAlbumDialog').html('');
-                        $('#embedPhotoModalBodyAlbumDialog').off('click');
-                        $('#embedPhotoModal').modal('hide');
+								},
+                               'json');
+                            $('#embedPhotoModalBodyAlbumDialog').html('');
+                            $('#embedPhotoModalBodyAlbumDialog').off('click');
+                            $('#embedPhotoModal').modal('hide');
+						}
                     });
+
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
                 } else {
                     window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
                 }
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index 7ad4482e4..cbcf46320 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -41,10 +41,6 @@
 				</div>
 				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
 			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
 		</div><!-- /.modal-content -->
 	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 0ffc8b349..c1dab52d5 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -459,13 +459,7 @@ var activeCommentText = '';
                         if (typeof($(image).parent()[0]) !== 'undefined') {
                             var imageparent = document.getElementById($(image).parent()[0].id);
                             $(imageparent).toggleClass('embed-photo-selected-photo');
-                        }
-                    });
-                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-                    $('#embed-photo-OKButton').click(function () {
-                        $('.embed-photo-selected-photo').each(function (index) {
-                            var href = $(this).attr('href');
+                            var href = $(imageparent).attr('href');
                             $.post("embedphotos/photolink", {href: href},
                                 function(ddata) {
                                     if (ddata['status']) {
@@ -476,12 +470,14 @@ var activeCommentText = '';
                                     }
                                     return false;
                                 },
-                            'json');
-                        });
-                        $('#embedPhotoModalBodyAlbumDialog').html('');
-                        $('#embedPhotoModalBodyAlbumDialog').off('click');
-                        $('#embedPhotoModal').modal('hide');
+         	                   'json');
+	                        $('#embedPhotoModalBodyAlbumDialog').html('');
+    	                    $('#embedPhotoModalBodyAlbumDialog').off('click');
+        	                $('#embedPhotoModal').modal('hide');
+                        }
                     });
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
                 } else {
                     window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
                 }
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 13e7602be..bc9339d4c 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -293,10 +293,6 @@
 				</div>
 				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
 			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
 		</div><!-- /.modal-content -->
 	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 832f135f3..edde6af3f 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -35,8 +35,6 @@
 			<br />
 			{{/if}}
 
-
-
 			<div id="profile-photo-submit-wrapper">
 				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
 			</div>
@@ -65,10 +63,6 @@
 				</div>
 				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
 			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
 		</div><!-- /.modal-content -->
 	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index f1ab1ebad..2be323deb 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -91,10 +91,6 @@
 				</div>
 				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
 			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
 		</div><!-- /.modal-content -->
 	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
@@ -391,16 +387,10 @@
 						if (typeof($(image).parent()[0]) !== 'undefined') {
 							var imageparent = document.getElementById($(image).parent()[0].id);
 							$(imageparent).toggleClass('embed-photo-selected-photo');
-						}
-					});
-					$('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-					$('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-					$('#embed-photo-OKButton').click(function () {
-						$('.embed-photo-selected-photo').each(function (index) {
-							var href = $(this).attr('href');
-							$.post("embedphotos/photolink", {href: href},
-								function(ddata) {
-									if (ddata['status']) {
+							var href = $(imageparent).attr('href');
+                            $.post("embedphotos/photolink", {href: href},
+                                function(ddata) {
+                                    if (ddata['status']) {
 										{{if !$mimeType || $mimeType == 'text/markdown'}}
 										var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
 										editor.getSession().insert(editor.getCursorPosition(), imgURL)
@@ -408,17 +398,20 @@
 										var currentContent = $('#editor').val();
 										$('#editor').val(currentContent + ddata['photolink']);
 										{{/if}}
-									} else {
-										window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
-									}
-									return false;
+                                    } else {
+                                        window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
+                                    }
+                                    return false;
 								},
-							'json');
-						});
-						$('#embedPhotoModalBodyAlbumDialog').html('');
-						$('#embedPhotoModalBodyAlbumDialog').off('click');
-						$('#embedPhotoModal').modal('hide');
-					});
+                               'json');
+                            $('#embedPhotoModalBodyAlbumDialog').html('');
+                            $('#embedPhotoModalBodyAlbumDialog').off('click');
+                            $('#embedPhotoModal').modal('hide');
+						}
+                    });
+
+					$('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+					$('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
 				} else {
 					window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
 				}