diff --git a/webclient/room/room.html b/webclient/room/room.html
index 0f01b94c3..eba088188 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -74,12 +74,14 @@
                     <td>
                         <input id="mainInput" ng-model="imageURLToSend" ng-enter="sendImage()" placeholder="Image URL"/>
                     </td>
-                    <td  width="100px">
+                    <td width="100px">
                         <button ng-click="sendImage(imageURLToSend)">Send URL</button>
                     </td>
+                    <!-- TODO: To enable once we have an upload server
                     <td width="100px">
                         <button m-file-input="imageFileToSend">Send Image</button>
                     </td>
+                    -->
                 </tr>
             </table>
 
diff --git a/webclient/rooms/rooms.html b/webclient/rooms/rooms.html
index 3630eedfd..007ad2999 100644
--- a/webclient/rooms/rooms.html
+++ b/webclient/rooms/rooms.html
@@ -13,10 +13,12 @@
                         </div>
                     </td>
                     <td>
+                         <!-- TODO: To enable once we have an upload server
                         <button  m-file-input="newProfileInfo.avatarFile">Upload new Avatar</button> 
                         or use an existing image URL:
+                         -->
                         <div>
-                            <input size="40" ng-model="newProfileInfo.avatar" ng-enter="setAvatar(newProfileInfo.avatar)" />
+                            <input size="40" ng-model="newProfileInfo.avatar" ng-enter="setAvatar(newProfileInfo.avatar)" placeholder="Image URL"/>
                             <button ng-disabled="!newProfileInfo.avatar" ng-click="setAvatar(newProfileInfo.avatar)">Update Avatar</button>   
                         </div>
                     </td>