diff --git a/templates/partials/modals/change_picture_modal.tpl b/templates/partials/modals/change_picture_modal.tpl
index 08ba3ce..6265781 100644
--- a/templates/partials/modals/change_picture_modal.tpl
+++ b/templates/partials/modals/change_picture_modal.tpl
@@ -1,9 +1,9 @@
-	<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true">
+	<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="change-picture" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="myModalLabel">[[user:change_picture]]</h3>
+					<h3 id="change-picture">[[user:change_picture]]</h3>
 				</div>
 				<div class="modal-body">
 					<div id="gravatar-box">
diff --git a/templates/partials/modals/upload_picture_from_url_modal.tpl b/templates/partials/modals/upload_picture_from_url_modal.tpl
index 240d709..b8d1222 100644
--- a/templates/partials/modals/upload_picture_from_url_modal.tpl
+++ b/templates/partials/modals/upload_picture_from_url_modal.tpl
@@ -1,9 +1,9 @@
-	<div id="upload-picture-from-url-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Upload Picture From Url" aria-hidden="true">
+	<div id="upload-picture-from-url-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="upload-picture-url" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3>[[user:upload_picture]]</h3>
+					<h3 id="upload-picture-url">[[user:upload_picture]]</h3>
 				</div>
 				<div class="modal-body">
 					<input id="uploadFromUrl" class="form-control" type="text"/>
diff --git a/templates/partials/modals/upload_picture_modal.tpl b/templates/partials/modals/upload_picture_modal.tpl
index a325ac1..f29a886 100644
--- a/templates/partials/modals/upload_picture_modal.tpl
+++ b/templates/partials/modals/upload_picture_modal.tpl
@@ -1,9 +1,9 @@
-	<div id="upload-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Upload Picture" aria-hidden="true">
+	<div id="upload-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="upload-picture" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="myModalLabel">[[user:upload_picture]]</h3>
+					<h3 id="upload-picture">[[user:upload_picture]]</h3>
 				</div>
 				<div class="modal-body">
 					<form id="uploadForm" action="" method="post" enctype="multipart/form-data">