diff --git a/src/actions/user/reducer.actions.js b/src/actions/user/reducer.actions.js
index 03bf61f..33e4a47 100644
--- a/src/actions/user/reducer.actions.js
+++ b/src/actions/user/reducer.actions.js
@@ -9,7 +9,8 @@ import {
   SET_COMPLETE_REGISTRATION_CLIENT_OR_PROVIDER,
   SET_FORM_PHONE_NUMBER,
   SET_FORM_BUSINESS_NUMBER,
-  SET_FORM_SOCIAL_INSURANCE_NUMBER
+  SET_FORM_SOCIAL_INSURANCE_NUMBER,
+  SET_EDIT_PROFILE_TAB_ACTIVE_INDEX
 } from "../../constants/user.constants";
 import { parseError } from "../common.actions";
 
@@ -94,3 +95,10 @@ export function setFormSocialInsuranceNumber(socialInsuranceNumber) {
     data: socialInsuranceNumber
   };
 }
+
+export function setEditProfileTabActiveIndex(indexVal) {
+  return {
+    type: SET_EDIT_PROFILE_TAB_ACTIVE_INDEX,
+    data: indexVal
+  };
+}
diff --git a/src/components/App.jsx b/src/components/App.jsx
index cad0395..19bc87c 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -8,6 +8,7 @@ import ResetPassword from "./Auth/ResetPassword";
 import Settings from "./Auth/Settings";
 import VerifyEmail from "./Auth/VerifyEmail";
 import CompleteRegistration from "./User/CompleteRegistration";
+import EditProfile from "./User/EditProfile";
 import Profile from "./User/Profile";
 import PrivateRoute from "./Shared/PrivateRoute";
 import About from "./Static/About";
@@ -45,6 +46,7 @@ class App extends Component {
                 path="/auth/reset-password/:uid/:token"
                 component={ResetPassword}
               />
+              <PrivateRoute path="/user/profile/edit" component={EditProfile} />
               <PrivateRoute path="/user/profile" component={Profile} />
               <Route path='/user/complete-registration' component={Profile} />
               <Route component={NoMatch} />
diff --git a/src/components/User/EditClientForm.jsx b/src/components/User/EditClientForm.jsx
new file mode 100644
index 0000000..b0666bd
--- /dev/null
+++ b/src/components/User/EditClientForm.jsx
@@ -0,0 +1,59 @@
+import React, { Component } from "react";
+import { connect } from "react-redux";
+
+import {
+  clearUserRequestError,
+  clearUserRequestSuccess,
+  setFormBusinessNumber
+} from "../../actions/user/reducer.actions";
+import { updateClientRequest } from "../../actions/user/saga.actions";
+import ClientFormView from "./ClientFormView";
+
+class EditClientForm extends Component {
+  changeBusinessNumber = event => {
+    this.props.dispatch(setFormBusinessNumber(event.target.value));
+    this.props.dispatch(clearUserRequestError());
+    this.props.dispatch(clearUserRequestSuccess());
+  };
+
+  onSubmitClient = event => {
+    event.preventDefault();
+    const { selfUser, businessNumber } = this.props;
+    const businessNumberVal =
+      businessNumber || (selfUser.client || {}).business_number;
+    this.props.dispatch(
+      updateClientRequest({
+        username: selfUser.username,
+        business_number: businessNumberVal
+      })
+    );
+  };
+
+  render() {
+    const {
+      isSendingUserRequest,
+      userRequestError,
+      userRequestSuccess,
+      businessNumber,
+      selfUser
+    } = this.props;
+    const businessNumberVal =
+      businessNumber || (selfUser.client || {}).business_number;
+    return (
+      <ClientFormView
+        isSendingUserRequest={isSendingUserRequest}
+        userRequestError={userRequestError}
+        userRequestSuccess={userRequestSuccess}
+        businessNumber={businessNumberVal}
+        changeBusinessNumber={this.changeBusinessNumber}
+        onSubmitClient={this.onSubmitClient}
+      />
+    );
+  }
+}
+
+function mapStateToProps(state) {
+  return { ...state.user };
+}
+
+export default connect(mapStateToProps)(EditClientForm);
diff --git a/src/components/User/EditProfile.jsx b/src/components/User/EditProfile.jsx
new file mode 100644
index 0000000..fd3b064
--- /dev/null
+++ b/src/components/User/EditProfile.jsx
@@ -0,0 +1,59 @@
+import React, { Component } from "react";
+import { connect } from "react-redux";
+import { Container, Header, Tab } from "semantic-ui-react";
+
+import {
+  setEditProfileTabActiveIndex,
+  clearUserRequestError,
+  clearUserRequestSuccess
+} from "../../actions/user/reducer.actions";
+import EditClientForm from "./EditClientForm";
+import EditProviderForm from "./EditProviderForm";
+import EditUserInfoForm from "./EditUserInfoForm";
+
+class EditProfile extends Component {
+  onTabChange = (event, { activeIndex }) => {
+    if (this.props.editProfileActiveIndex !== activeIndex) {
+      this.props.dispatch(clearUserRequestError());
+      this.props.dispatch(clearUserRequestSuccess());
+    }
+    this.props.dispatch(setEditProfileTabActiveIndex(activeIndex));
+  };
+
+  render() {
+    const { selfUser, editProfileActiveIndex } = this.props;
+    const panes = [
+      {
+        menuItem: "User Information",
+        render: () => <Tab.Pane><EditUserInfoForm /></Tab.Pane>
+      }
+    ];
+    if (selfUser.client) {
+      panes.push({
+        menuItem: "Client Information",
+        render: () => <Tab.Pane><EditClientForm /></Tab.Pane>
+      });
+    } else if (selfUser.provider) {
+      panes.push({
+        menuItem: "Provider Information",
+        render: () => <Tab.Pane><EditProviderForm /></Tab.Pane>
+      });
+    }
+    return (
+      <Container>
+        <Header>Edit Profile</Header>
+        <Tab
+          panes={panes}
+          onTabChange={this.onTabChange}
+          activeIndex={editProfileActiveIndex}
+        />
+      </Container>
+    );
+  }
+}
+
+function mapStateToProps(state) {
+  return { ...state.user };
+}
+
+export default connect(mapStateToProps)(EditProfile);
diff --git a/src/components/User/EditProviderForm.jsx b/src/components/User/EditProviderForm.jsx
new file mode 100644
index 0000000..f14a511
--- /dev/null
+++ b/src/components/User/EditProviderForm.jsx
@@ -0,0 +1,56 @@
+import React, { Component } from "react";
+import { connect } from "react-redux";
+
+import {
+  clearUserRequestError,
+  clearUserRequestSuccess,
+  setFormSocialInsuranceNumber
+} from "../../actions/user/reducer.actions";
+import { updateProviderRequest } from "../../actions/user/saga.actions";
+import ProviderFormView from "./ProviderFormView";
+
+class EditProviderForm extends Component {
+  changeSocialInsuranceNumber = event => {
+    this.props.dispatch(setFormSocialInsuranceNumber(event.target.value));
+    this.props.dispatch(clearUserRequestError());
+    this.props.dispatch(clearUserRequestSuccess());
+  };
+
+  onSubmitProvider = event => {
+    event.preventDefault();
+    const { selfUser, socialInsuranceNumber } = this.props;
+    const socialInsuranceNumberVal =
+      socialInsuranceNumber || (selfUser.provider || {}).sin;
+    this.props.dispatch(
+      updateProviderRequest({ username: selfUser.username, sin: socialInsuranceNumberVal })
+    );
+  };
+
+  render() {
+    const {
+      isSendingUserRequest,
+      userRequestError,
+      userRequestSuccess,
+      socialInsuranceNumber,
+      selfUser
+    } = this.props;
+    const socialInsuranceNumberVal =
+      socialInsuranceNumber || (selfUser.provider || {}).sin;
+    return (
+      <ProviderFormView
+        isSendingUserRequest={isSendingUserRequest}
+        userRequestError={userRequestError}
+        userRequestSuccess={userRequestSuccess}
+        socialInsuranceNumber={socialInsuranceNumberVal}
+        changeSocialInsuranceNumber={this.changeSocialInsuranceNumber}
+        onSubmitProvider={this.onSubmitProvider}
+      />
+    );
+  }
+}
+
+function mapStateToProps(state) {
+  return { ...state.user };
+}
+
+export default connect(mapStateToProps)(EditProviderForm);
diff --git a/src/components/User/EditUserInfoForm.jsx b/src/components/User/EditUserInfoForm.jsx
new file mode 100644
index 0000000..f79fb7d
--- /dev/null
+++ b/src/components/User/EditUserInfoForm.jsx
@@ -0,0 +1,62 @@
+import React, { Component } from "react";
+import { connect } from "react-redux";
+
+import {
+  clearUserRequestError,
+  clearUserRequestSuccess,
+  setFormPhoneNumber
+} from "../../actions/user/reducer.actions";
+import { updateUserInfoRequest } from "../../actions/user/saga.actions";
+
+import UserInfoFormView from "./UserInfoFormView";
+
+class EditUserInfoForm extends Component {
+  changePhoneNumber = event => {
+    this.props.dispatch(setFormPhoneNumber(event.target.value));
+    this.props.dispatch(clearUserRequestError());
+    this.props.dispatch(clearUserRequestSuccess());
+  };
+
+  onSubmitUserInfo = event => {
+    event.preventDefault();
+    const { selfUser, phoneNumber } = this.props;
+    const phoneNumberVal =
+      phoneNumber || (selfUser.userinfo || {}).phone_number;
+
+    this.props.dispatch(
+      updateUserInfoRequest({
+        ...selfUser.userinfo,
+        username: selfUser.username,
+        phone_number: phoneNumberVal
+      })
+    );
+  };
+
+  render() {
+    const {
+      isSendingUserRequest,
+      userRequestError,
+      userRequestSuccess,
+      selfUser,
+      phoneNumber
+    } = this.props;
+    const phoneNumberVal =
+      phoneNumber || (selfUser.userinfo || {}).phone_number;
+    return (
+      <UserInfoFormView
+        isSendingUserRequest={isSendingUserRequest}
+        userRequestError={userRequestError}
+        userRequestSuccess={userRequestSuccess}
+        phoneNumber={phoneNumberVal}
+        changePhoneNumber={this.changePhoneNumber}
+        onSubmitUserInfo={this.onSubmitUserInfo}
+      />
+    );
+  }
+}
+
+function mapStateToProps(state) {
+  return { ...state.user };
+}
+
+export default connect(mapStateToProps)(EditUserInfoForm);
diff --git a/src/components/User/Profile.jsx b/src/components/User/Profile.jsx
index 590952c..c25bcc1 100644
--- a/src/components/User/Profile.jsx
+++ b/src/components/User/Profile.jsx
@@ -1,5 +1,6 @@
 import React, { Component } from "react";
 import { connect } from "react-redux";
+import { Link } from "react-router-dom";
 import { Card, Container, Header, Label, List } from "semantic-ui-react";
 
 class Profile extends Component {
@@ -16,10 +17,17 @@ function mapStateToProps(state) {
 const ProfileView = ({ user }) => (
   <Container>
     <Header>Profile</Header>
-    <Card>
+    <Card fluid={true}>
       <Card.Content>
         <Card.Header>{user.username || "No username!"}</Card.Header>
-        <Card.Meta>{user.email || "No email!"}</Card.Meta>
+        <Card.Meta>
+          {user.client && <Label color="blue" size="tiny">Client</Label>}
+          {user.provider && <Label color="orange" size="tiny">Provider</Label>}
+          <Label color={user.is_active ? "teal" : "red"} size="tiny">
+            {user.is_active ? "Active" : "Deactivated"}
+          </Label>
+          {" "}{user.email || "No email!"}
+        </Card.Meta>
         <Card.Description>
           <span>
             {!user.client &&
@@ -56,11 +64,7 @@ const ProfileView = ({ user }) => (
         </Card.Description>
       </Card.Content>
       <Card.Content extra>
-        {user.client && <Label color="blue">Client</Label>}
-        {user.provider && <Label color="orange">Provider</Label>}
-        <Label color={user.is_active ? "teal" : "red"}>
-          {user.is_active ? "Active" : "Deactivated"}
-        </Label>
+        <Link to="/user/profile/edit">Edit Profile</Link>
       </Card.Content>
     </Card>
   </Container>
diff --git a/src/components/User/UserInfoFormView.jsx b/src/components/User/UserInfoFormView.jsx
index b906ad2..76055fa 100644
--- a/src/components/User/UserInfoFormView.jsx
+++ b/src/components/User/UserInfoFormView.jsx
@@ -22,7 +22,7 @@ const UserInfoFormView = ({
       <Form.Field>
         <label>Phone Number</label>
         <input
-          placeholder="780-999-9999"
+          placeholder="7809999999"
           type="tel"
           value={phoneNumber}
           onChange={changePhoneNumber}
diff --git a/src/constants/user.constants.js b/src/constants/user.constants.js
index aa2f9cc..0a5c1aa 100644
--- a/src/constants/user.constants.js
+++ b/src/constants/user.constants.js
@@ -12,6 +12,8 @@ export const SET_FORM_PHONE_NUMBER = "SET_FORM_PHONE_NUMBER";
 export const SET_FORM_BUSINESS_NUMBER = "SET_FORM_BUSINESS_NUMBER";
 export const SET_FORM_SOCIAL_INSURANCE_NUMBER =
   "SET_FORM_SOCIAL_INSURANCE_NUMBER";
+export const SET_EDIT_PROFILE_TAB_ACTIVE_INDEX =
+  "SET_EDIT_PROFILE_TAB_ACTIVE_INDEX";
 
 // Saga User Action Constants
 export const GET_SELF_USER_REQUEST = "GET_SELF_USER_REQUEST";
diff --git a/src/reducers/userReducer.js b/src/reducers/userReducer.js
index 165d049..e208f76 100644
--- a/src/reducers/userReducer.js
+++ b/src/reducers/userReducer.js
@@ -10,6 +10,7 @@ import {
   SET_FORM_PHONE_NUMBER,
   SET_FORM_BUSINESS_NUMBER,
   SET_FORM_SOCIAL_INSURANCE_NUMBER,
+  SET_EDIT_PROFILE_TAB_ACTIVE_INDEX,
   USER_INFO_STEP,
   CLIENT
 } from "../constants/user.constants";
@@ -24,7 +25,8 @@ const initialState = {
   completeRegistrationClientOrProvider: CLIENT,
   phoneNumber: "",
   businessNumber: "",
-  socialInsuranceNumber: ""
+  socialInsuranceNumber: "",
+  editProfileActiveIndex: 0
 };
 
 function userReducer(state = initialState, action) {
@@ -88,6 +90,11 @@ function userReducer(state = initialState, action) {
         ...state,
         socialInsuranceNumber: action.data
       };
+    case SET_EDIT_PROFILE_TAB_ACTIVE_INDEX:
+      return {
+        ...state,
+        editProfileActiveIndex: action.data
+      };
     default:
       return state;
   }
diff --git a/src/sagas/user.sagas.js b/src/sagas/user.sagas.js
index 12b7add..0f19fc9 100644
--- a/src/sagas/user.sagas.js
+++ b/src/sagas/user.sagas.js
@@ -17,7 +17,6 @@ function* getSelfUserCall() {
   yield effects.put(isSendingUserRequest(true));
   try {
     const wasSuccessful = yield effects.call(getSelfUser);
-    yield effects.put(setUserRequestSuccess(wasSuccessful));
     yield effects.put(clearUserRequestError());
     // Check if the user exists, if yes set the user, otherwise force logout
     if (wasSuccessful.results && wasSuccessful.results.length) {
@@ -114,8 +113,6 @@ function* updateProviderCall(payload) {
 }
 
 export function* getSelfUserFlow(request) {
-  yield effects.put(clearUserRequestSuccess());
-  yield effects.put(clearUserRequestError());
   const wasSuccessful = yield effects.call(getSelfUserCall);
   if (!wasSuccessful) {
     yield effects.put(setSelfUserToken(""));
@@ -139,6 +136,7 @@ export function* updateUserInfoFlow(request) {
   yield effects.put(clearUserRequestError());
   const wasSuccessful = yield effects.call(updateUserInfoCall, request.data);
   if (wasSuccessful) {
+    yield effects.put(setUserRequestSuccess(wasSuccessful));
     yield effects.put(clearUserRequestError());
     yield effects.put(setCompleteRegistrationStep(CLIENT_OR_PROVIDER_STEP));
     yield effects.put(getSelfUserRequest());
@@ -160,6 +158,7 @@ export function* updateClientFlow(request) {
   yield effects.put(clearUserRequestError());
   const wasSuccessful = yield effects.call(updateClientCall, request.data);
   if (wasSuccessful) {
+    yield effects.put(setUserRequestSuccess(wasSuccessful));
     yield effects.put(clearUserRequestError());
     yield effects.put(getSelfUserRequest());
   }
@@ -180,6 +179,7 @@ export function* updateProviderFlow(request) {
   yield effects.put(clearUserRequestError());
   const wasSuccessful = yield effects.call(updateProviderCall, request.data);
   if (wasSuccessful) {
+    yield effects.put(setUserRequestSuccess(wasSuccessful));
     yield effects.put(clearUserRequestError());
     yield effects.put(getSelfUserRequest());
   }