diff --git a/static/src/app/models/model-interfaces.ts b/static/src/app/models/model-interfaces.ts
index 5b0a706..a3d5dd2 100644
--- a/static/src/app/models/model-interfaces.ts
+++ b/static/src/app/models/model-interfaces.ts
@@ -11,7 +11,7 @@ export interface User {
   _id?: string;
   boardUserId?: number;
   username?: string;
-  squad?: Squad;
+  squad?: any; //Squad or string
   rank?: Rank;
   awards?: Award[];
 }
@@ -54,7 +54,7 @@ export interface Rank {
 export interface Award {
   _id?: string,
   userId: string,
-  decorationId?: Decoration;
+  decorationId?: any; //Decoration or string
   reason?: string;
   proposer?: AppUser;
   date?: number; // since Date.now() returns a number
diff --git a/static/src/app/request/award/req-award.component.ts b/static/src/app/request/award/req-award.component.ts
index 3d213fe..6935187 100644
--- a/static/src/app/request/award/req-award.component.ts
+++ b/static/src/app/request/award/req-award.component.ts
@@ -79,7 +79,7 @@ export class RequestAwardComponent {
 
   addAwarding(previewImage, descriptionField) {
     if (this.decoration._id && this.reason.length > 0) {
-      const award = {
+      const award : Award = {
         "userId": this.user._id,
         "decorationId": this.decoration._id,
         "reason": this.reason,
diff --git a/static/src/app/users/edit-user/edit-user.component.html b/static/src/app/users/edit-user/edit-user.component.html
index 5e18fee..07c609b 100644
--- a/static/src/app/users/edit-user/edit-user.component.html
+++ b/static/src/app/users/edit-user/edit-user.component.html
@@ -4,7 +4,7 @@
 
   <div class="form-group">
     <label for="title">Name</label>
-    <input type="text" class="form-control"
+    <input class="form-control"
            [(ngModel)]="user.username"
            name="title"
            id="title"