diff --git a/css/login/CreateUser.css b/css/login/CreateUser.css
index 5308f57..e4ad79a 100644
--- a/css/login/CreateUser.css
+++ b/css/login/CreateUser.css
@@ -30,14 +30,14 @@
 
     .container-fluid {
         width: 595px;
-        height: 550px;
+        height: 623px;
         background-color: rgba(255,255,255,0.5);
         top: 50%;
         bottom: auto;
         left: -20%;
         right: 420px;
         margin: 0 auto;
-        margin-top: 400px;
+        margin-top: 350px;
     }
 
     #tbl_main {
diff --git a/login/CreateUser.aspx b/login/CreateUser.aspx
index acf9485..95b0eb8 100644
--- a/login/CreateUser.aspx
+++ b/login/CreateUser.aspx
@@ -152,7 +152,7 @@
                     justify-content: center;
                     align-items: center;
                     width: 410px;
-                    height: 613px;
+                    height: 643px;
                     margin: 0 auto;                                 
                 }
                 .container-fluid {
@@ -213,9 +213,15 @@
                                 <asp:Image ID="Image1" runat="server" style="width:128px;height:128px;background-color:#003680" AlternateText="A place where a photo of your face should be seen." ImageUrl="~/images/samples/default-avatar.jpg"/>
                           </td>
                             <td>
-                                <asp:FileUpload ID="FileUpload_Desktop" runat="server" AllowMultiple="false" ClientIDMode="AutoID" ToolTip="If you like to upload a photo you can do so here." />
+                                <asp:FileUpload ID="FileUpload_Desktop" runat="server" AllowMultiple="false" accept="image/*" ClientIDMode="AutoID" ToolTip="If you like to upload a photo you can do so here." OnInit="FileUpload_Desktop_Init"/>
                             </td>
                         </tr>
+                        <tr><td colspan="7" style="height:19px">
+                            <asp:RegularExpressionValidator ID="regex_fupl_deskt" runat="server" ControlToValidate="FileUpload_Desktop"
+                                 ErrorMessage="Only .gif, .jpg, .png, .tiff and .jpeg"
+                                 ValidationExpression="(.*\.([Gg][Ii][Ff])|.*\.([Jj][Pp][Gg])|.*\.([Bb][Mm][Pp])|.*\.([pP][nN][gG])|.*\.([tT][iI][iI][fF])$)">
+                            </asp:RegularExpressionValidator>
+                            </td></tr>
                          <tr style="height:38px">
                             <td colspan="12">
                                 <asp:Label ID="lbl_data" ClientIDMode="AutoID" runat="server" Enabled="true" Font-Size="18px" style="background-color:none;color:#003680" Text="Personal Data:"></asp:Label>
@@ -299,10 +305,15 @@
                             </td>
                             <td colspan="5">
                                 <center>
-                                       <asp:LinkButton ID="btn_Save_Changes" runat="server" BackColor="#043381" BorderStyle="None" CausesValidation="true" CssClass="btn btn-btn-primary"><label style="color:#fff" for="btn_Save_Changes">Save Changes</label></asp:LinkButton> 
+                                       <asp:LinkButton ID="btn_Save_Changes" runat="server" BackColor="#043381" BorderStyle="None" CausesValidation="true" CssClass="btn btn-btn-primary" OnClick="btn_Save_Changes_Click"><label style="color:#fff" for="btn_Save_Changes">Save Changes</label></asp:LinkButton> 
                                 </center>
                             </td>
                         </tr>
+                         <tr style="height:7px">
+                                  <td colspan="7">
+                                      <asp:Label ID="lbl_message_desktop" runat="server" Text=""></asp:Label>
+                                  </td>
+                              </tr>
                     </table>   
                 </div>
                        <!--Smartphone-Bildschirme-->   
@@ -318,15 +329,22 @@
                                 <asp:Label ID="lbl_text1_M" ClientIDMode="AutoID" runat="server" Enabled="true" Font-Size="18px" Width="400px" style="background-color:rgba(255,255,255,0.5);color:#003680;margin-left:-10px;"><center>Profile Picture:</center></asp:Label>
                             </td>
                       </tr>
-                      <tr><td colspan="7">
+                      <tr><td colspan="4">
                                 <asp:Image ID="Image1_M" runat="server" style="width:128px;height:128px;background-color:#003680" AlternateText="A place where a photo of your face should be seen." ImageUrl="~/images/samples/default-avatar.jpg"/>
-                          </td>
-                          </tr>
+                          </td>                          
+                          </tr>                                                 
                               <tr>
                             <td>
-                                <asp:FileUpload ID="FileUpload_Mobile" runat="server" />
+                                <asp:FileUpload ID="FileUpload_Mobile" runat="server" ValidateRequestMode="Enabled" OnInit="FileUpload_Mobile_Init"/>
                             </td>
-                        </tr>
+                              </tr>    
+                             
+                              <tr><td colspan="7" style="height:19px">
+                            <asp:RegularExpressionValidator ID="regex_fupl_mob" runat="server" ControlToValidate="FileUpload_Mobile"
+                                 ErrorMessage="Only .gif, .jpg, .png, .tiff and .jpeg"
+                                 ValidationExpression="(.*\.([Gg][Ii][Ff])|.*\.([Jj][Pp][Gg])|.*\.([Bb][Mm][Pp])|.*\.([pP][nN][gG])|.*\.([tT][iI][iI][fF])$)">
+                            </asp:RegularExpressionValidator>
+                            </td></tr>
                          <tr style="height:38px">
                             <td colspan="12">
                                 <asp:Label ID="lbl_data_M" ClientIDMode="AutoID" runat="server" Enabled="true" Font-Size="18px" style="background-color:none;color:#003680" Text="Personal Data:"></asp:Label>
@@ -389,10 +407,15 @@
                               <tr >
                             <td colspan="5" style="height:35px">
                                 <center>
-                                       <asp:LinkButton ID="LinkButton1" runat="server" BackColor="#043381" BorderStyle="None" CausesValidation="true" CssClass="btn btn-btn-primary"><label style="color:#fff" for="btn_Save_Changes">Save Changes</label></asp:LinkButton> 
+                                       <asp:LinkButton ID="LinkButton1" runat="server" BackColor="#043381" BorderStyle="None"  CausesValidation="true" CssClass="btn btn-btn-primary" OnClick="LinkButton1_Click"><label style="color:#fff" for="btn_Save_Changes">Save Changes</label></asp:LinkButton> 
                                 </center>
                             </td>
                         </tr>
+                              <tr>
+                                  <td>
+                                      <asp:Label ID="lblMessage_mob" runat="server" Text=""></asp:Label>
+                                  </td>
+                              </tr>
                     </table>   
                           </div>
                 </center>
diff --git a/login/CreateUser.aspx.vb b/login/CreateUser.aspx.vb
index 52c1565..6d892ed 100644
--- a/login/CreateUser.aspx.vb
+++ b/login/CreateUser.aspx.vb
@@ -2,4 +2,56 @@
 Partial Class login_CreateUser
     Inherits System.Web.UI.Page
 
+
+    Protected Sub FileUpload_Mobile_Init(sender As Object, e As EventArgs)
+
+    End Sub
+
+    Protected Sub FileUpload_Desktop_Init(sender As Object, e As EventArgs)
+
+    End Sub
+
+
+
+
+    Protected Sub LinkButton1_Click(sender As Object, e As EventArgs)
+        Dim validFileTypes As String() = {"bmp", "gif", "png", "jpg", "jpeg", "doc", "xls"}
+        Dim ext As String = System.IO.Path.GetExtension(FileUpload_Mobile.PostedFile.FileName)
+        Dim isValidFile As Boolean = False
+        For i As Integer = 0 To validFileTypes.Length - 1
+            If ext = "." & validFileTypes(i) Then
+                isValidFile = True
+                Exit For
+            End If
+        Next
+        If Not isValidFile Then
+            lblMessage_mob.ForeColor = System.Drawing.Color.Red
+            lblMessage_mob.Text = "Invalid File. Please upload a File with extension " &
+                            String.Join(",", validFileTypes)
+        Else
+            lblMessage_mob.ForeColor = System.Drawing.Color.Green
+            lblMessage_mob.Text = "File uploaded successfully."
+        End If
+    End Sub
+
+    Protected Sub btn_Save_Changes_Click(sender As Object, e As EventArgs)
+        Dim validFileTypes As String() = {"bmp", "gif", "png", "jpg", "jpeg", "doc", "xls"}
+        Dim ext As String = System.IO.Path.GetExtension(FileUpload_Desktop.PostedFile.FileName)
+        Dim isValidFile As Boolean = False
+        For i As Integer = 0 To validFileTypes.Length - 1
+            If ext = "." & validFileTypes(i) Then
+                isValidFile = True
+                Exit For
+            End If
+        Next
+        If Not isValidFile Then
+            lbl_message_desktop.ForeColor = System.Drawing.Color.Red
+            lbl_message_desktop.Text = "Invalid File. Please upload a File with extension " &
+                            String.Join(",", validFileTypes)
+        Else
+            lbl_message_desktop.ForeColor = System.Drawing.Color.Green
+            lbl_message_desktop.Text = "File uploaded successfully."
+        End If
+    End Sub
+
 End Class