diff --git a/assets/js/EditProfile.jsx b/assets/js/EditProfile.jsx
index e776152aa7d6df9864697ec584db3485bca574a5..c7cb5c6221fa0190780c9f22138faece1b128d6c 100644
--- a/assets/js/EditProfile.jsx
+++ b/assets/js/EditProfile.jsx
@@ -25,6 +25,8 @@ export default class ProfilePage extends React.Component {
       email: '',
       gender: '',
       region: '',
+      alamat: '',
+      alamat: '',
       cityOfBirth: '',
       dateOfBirth: '',
       resume: '',
@@ -44,6 +46,8 @@ export default class ProfilePage extends React.Component {
         phone_number: '',
         gender: '',
         region: '',
+        alamat: '',
+        alamat: '',
         skills: '',
         resume: '',
         portfolio_link: '',
@@ -103,6 +107,7 @@ export default class ProfilePage extends React.Component {
         email: data.user.email,
         gender: data.gender,
         region: data.region,
+        alamat: data.alamat,
         cityOfBirth: data.birth_place,
         dateOfBirth: this.parseIndonesianDateFormat(data.birth_date),
         phone_number: data.phone_number,
@@ -337,6 +342,15 @@ export default class ProfilePage extends React.Component {
                 name="region"
               />
             </Form.Field>
+            <Form.Field>
+              <label htmlFor="alamat">Alamat</label>
+              <input
+                onChange={this.handleChange}
+                placeholder={this.state.alamat === null ? 'JL. Satya Raya No.41' : this.state.alamat}
+                defaultValue={this.state.alamat === null ? null : this.state.alamat}
+                name="alamat"
+              />
+            </Form.Field>
             <Form.Field>
               <label htmlFor="skills">Skills</label>
               <input onChange={this.handleChange} placeholder="Isi sesuai dengan keahlian anda" name="skills" />
diff --git a/assets/js/ProfilePage.jsx b/assets/js/ProfilePage.jsx
index 8e4fe344653e19527effee15484b9fd9f6bbb237..cedd4c352dd5597aa66828ea9139f7efb4897f04 100755
--- a/assets/js/ProfilePage.jsx
+++ b/assets/js/ProfilePage.jsx
@@ -333,7 +333,12 @@ export default class ProfilePage extends React.Component {
             </Form.Field>
             <Form.Field>
               <label htmlFor="alamat">Alamat</label>
-              <input onChange={this.handleChange} placeholder="JL. Satya Raya No.41" name="alamat" />
+              <input
+                onChange={this.handleChange}
+                placeholder={this.state.alamat === null ? 'Indonesia' : this.state.alamat}
+                defaultValue={this.state.alamat === null ? null : this.state.alamat}
+                name="alamat"
+              />
             </Form.Field>
             <Form.Field>
               <label htmlFor="region">Region</label>