diff --git a/imports/api/settings/methods.js b/imports/api/settings/methods.js
index f5eba23..927cfb8 100644
--- a/imports/api/settings/methods.js
+++ b/imports/api/settings/methods.js
@@ -63,13 +63,15 @@ export const updateProfile = new ValidatedMethod({
             type: String
         },
         'users.username': {
-            type: String
+            type: String,
+            optional: true
         },
         'users.number': {
             type: String
         },
         'users.email': {
-            type: String
+            type: String,
+            optional: true
         },
         'users.address': {
             type: String
@@ -80,7 +82,12 @@ export const updateProfile = new ValidatedMethod({
             throw new Meteor.Error(500, 'You cannot empty the username/email.');
         }
         let update = {'profile.fullName': users.name, 'profile.address': users.address , 'profile.contactNumber': users.number};
-        users.username ? update['username'] = users.username : update['emails.0.address'] = users.email;
+        if(users.username) {
+            update['username'] = users.username;
+        }
+        if(users.email) {
+            update['emails.0.address'] = users.email;
+        }
         Meteor.users.update({_id: Meteor.userId()} , {$set: update});
     }
 });
diff --git a/imports/ui/components/settings/Settings.jsx b/imports/ui/components/settings/Settings.jsx
index cc8efbb..a73b734 100755
--- a/imports/ui/components/settings/Settings.jsx
+++ b/imports/ui/components/settings/Settings.jsx
@@ -273,19 +273,36 @@ class SettingsPage extends Component {
                             />
                         {Meteor.user().username ?
 
-                        <Input type='text' label='Username'
-                               name= 'username'
+                            (<span><Input type='text' label='Username'
+                               name='username'
                                value={this.state.username}
                                onChange={this.onChange.bind(this)}
                                required
                             />
+
+                        <Input type='email' label='Email'
+                               name='email'
+                               value={this.state.email}
+                               onChange={this.onChange.bind(this)}
+                            />
+                                </span>
+                            )
                             :
+
+                        (<span><Input type='text' label='Username'
+                               name='username'
+                               value={this.state.username}
+                               onChange={this.onChange.bind(this)}
+                            />
+
                         <Input type='email' label='Email'
-                               name= 'email'
+                               name='email'
                                value={this.state.email}
                                onChange={this.onChange.bind(this)}
                                required
                             />
+                                </span>
+                        )
                         }
                         <Input type='text' label='Address'
                                name='address'
@@ -416,7 +433,8 @@ class SettingsPage extends Component {
                             <div className={theme.cardContent}>
                                 <h6>name: <span>{Meteor.user().profile.fullName || 'Not Available'}</span></h6>
                                 <h6>Contact Number: <span> {Meteor.user().profile.contactNumber || 'Not Available'}</span></h6>
-                                <h6> <span> {Meteor.user().username ? 'Username:' : 'Email:' } </span> {Meteor.user().username ? Meteor.user().username : Meteor.user().emails[0].address }</h6>
+                                <h6>Username:<span> { Meteor.user().username ? Meteor.user().username :'Not Available'} </span> </h6>
+                                <h6>Email: <span> {Meteor.user().emails ? Meteor.user().emails[0].address :'Not Available'}</span></h6>
                                 <h6>Address: <span> {Meteor.user().profile.address || 'Not Available'}</span></h6>
                                 <div className={theme.settingBtn}>
                                     <Button label='EDIT INFO' raised accent onClick={this.openPopup.bind(this, 'personalInformation')} />
diff --git a/imports/ui/components/settings/theme.scss b/imports/ui/components/settings/theme.scss
index c0d519a..d38e7c7 100644
--- a/imports/ui/components/settings/theme.scss
+++ b/imports/ui/components/settings/theme.scss
@@ -37,6 +37,12 @@
       width: 80%;
       display: inline-block;
     }
+    &:nth-child(3){
+      text-transform: initial;
+    }
+    &:nth-child(4){
+      text-transform: initial;
+    }
     span{
       label{
         display: inline-block;